Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 88610 invoked from network); 30 Apr 2009 12:15:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Apr 2009 12:15:10 -0000 Received: (qmail 38871 invoked by uid 500); 30 Apr 2009 12:15:10 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 38814 invoked by uid 500); 30 Apr 2009 12:15:10 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 38805 invoked by uid 99); 30 Apr 2009 12:15:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2009 12:15:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2009 12:15:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 714B42388B68; Thu, 30 Apr 2009 12:14:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r770187 [2/3] - in /jackrabbit/trunk: jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ jackrabbit-core... Date: Thu, 30 Apr 2009 12:14:34 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090430121440.714B42388B68@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplate.java Thu Apr 30 12:14:29 2009 @@ -17,10 +17,10 @@ package org.apache.jackrabbit.core.security.authorization.acl; import org.apache.commons.collections.map.ListOrderedMap; -import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry; -import org.apache.jackrabbit.api.jsr283.security.AccessControlException; -import org.apache.jackrabbit.api.jsr283.security.Privilege; -import org.apache.jackrabbit.api.jsr283.security.AccessControlManager; +import javax.jcr.security.AccessControlEntry; +import javax.jcr.security.AccessControlException; +import javax.jcr.security.Privilege; +import javax.jcr.security.AccessControlManager; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.api.security.principal.NoSuchPrincipalException; import org.apache.jackrabbit.core.NodeImpl; @@ -51,7 +51,7 @@ * Implementation of the {@link JackrabbitAccessControlList} interface that * is detached from the effective access control content. Consequently, any * modifications applied to this ACL only take effect, if the policy gets - * {@link org.apache.jackrabbit.api.jsr283.security.AccessControlManager#setPolicy(String, org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy) reapplied} + * {@link javax.jcr.security.AccessControlManager#setPolicy(String, javax.jcr.security.AccessControlPolicy) reapplied} * to the AccessControlManager and the changes are saved. */ class ACLTemplate implements JackrabbitAccessControlList { @@ -308,7 +308,7 @@ //--------------------------------------------------< AccessControlList >--- /** - * @see org.apache.jackrabbit.api.jsr283.security.AccessControlList#getAccessControlEntries() + * @see javax.jcr.security.AccessControlList#getAccessControlEntries() */ public AccessControlEntry[] getAccessControlEntries() throws RepositoryException { List l = internalGetEntries(); @@ -316,7 +316,7 @@ } /** - * @see org.apache.jackrabbit.api.jsr283.security.AccessControlList#addAccessControlEntry(Principal, Privilege[]) + * @see javax.jcr.security.AccessControlList#addAccessControlEntry(Principal, Privilege[]) */ public boolean addAccessControlEntry(Principal principal, Privilege[] privileges) throws AccessControlException, RepositoryException { @@ -324,7 +324,7 @@ } /** - * @see org.apache.jackrabbit.api.jsr283.security.AccessControlList#removeAccessControlEntry(AccessControlEntry) + * @see javax.jcr.security.AccessControlList#removeAccessControlEntry(AccessControlEntry) */ public synchronized void removeAccessControlEntry(AccessControlEntry ace) throws AccessControlException, RepositoryException { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedEditor.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedEditor.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedEditor.java Thu Apr 30 12:14:29 2009 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.core.security.authorization.combined; -import org.apache.jackrabbit.api.jsr283.security.AccessControlException; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; +import javax.jcr.security.AccessControlException; +import javax.jcr.security.AccessControlPolicy; import org.apache.jackrabbit.core.security.authorization.AccessControlEditor; import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlPolicy; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/combined/CombinedProvider.java Thu Apr 30 12:14:29 2009 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.core.ItemImpl; import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; +import javax.jcr.security.AccessControlPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLEditor.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLEditor.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLEditor.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLEditor.java Thu Apr 30 12:14:29 2009 @@ -16,10 +16,10 @@ */ package org.apache.jackrabbit.core.security.authorization.principalbased; -import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry; -import org.apache.jackrabbit.api.jsr283.security.AccessControlException; -import org.apache.jackrabbit.api.jsr283.security.Privilege; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; +import javax.jcr.security.AccessControlEntry; +import javax.jcr.security.AccessControlException; +import javax.jcr.security.Privilege; +import javax.jcr.security.AccessControlPolicy; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.ProtectedItemModifier; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLProvider.java Thu Apr 30 12:14:29 2009 @@ -35,10 +35,10 @@ import org.apache.jackrabbit.spi.Path; import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl; import org.apache.jackrabbit.api.security.principal.PrincipalManager; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; -import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry; -import org.apache.jackrabbit.api.jsr283.security.Privilege; -import org.apache.jackrabbit.api.jsr283.security.AccessControlManager; +import javax.jcr.security.AccessControlPolicy; +import javax.jcr.security.AccessControlEntry; +import javax.jcr.security.Privilege; +import javax.jcr.security.AccessControlManager; import org.apache.jackrabbit.util.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLTemplate.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLTemplate.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLTemplate.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/principalbased/ACLTemplate.java Thu Apr 30 12:14:29 2009 @@ -16,11 +16,11 @@ */ package org.apache.jackrabbit.core.security.authorization.principalbased; -import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry; -import org.apache.jackrabbit.api.jsr283.security.AccessControlException; -import org.apache.jackrabbit.api.jsr283.security.AccessControlList; -import org.apache.jackrabbit.api.jsr283.security.Privilege; -import org.apache.jackrabbit.api.jsr283.security.AccessControlManager; +import javax.jcr.security.AccessControlEntry; +import javax.jcr.security.AccessControlException; +import javax.jcr.security.AccessControlList; +import javax.jcr.security.Privilege; +import javax.jcr.security.AccessControlManager; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.security.authorization.AccessControlConstants; @@ -51,7 +51,7 @@ * Implementation of the {@link JackrabbitAccessControlList} interface that * is detached from the effective access control content. Consequently, any * modifications applied to this ACL only take effect, if the policy gets - * {@link org.apache.jackrabbit.api.jsr283.security.AccessControlManager#setPolicy(String, org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy) reapplied} + * {@link javax.jcr.security.AccessControlManager#setPolicy(String, javax.jcr.security.AccessControlPolicy) reapplied} * to the AccessControlManager and the changes are saved. */ class ACLTemplate implements JackrabbitAccessControlList, AccessControlConstants { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleAccessManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleAccessManager.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleAccessManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/simple/SimpleAccessManager.java Thu Apr 30 12:14:29 2009 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.core.security.simple; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; -import org.apache.jackrabbit.api.jsr283.security.Privilege; +import javax.jcr.security.AccessControlPolicy; +import javax.jcr.security.Privilege; import org.apache.jackrabbit.core.HierarchyManager; import org.apache.jackrabbit.core.ItemId; import org.apache.jackrabbit.core.security.AMContext; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java Thu Apr 30 12:14:29 2009 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.core.security.user; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; -import org.apache.jackrabbit.api.jsr283.security.Privilege; +import javax.jcr.security.AccessControlPolicy; +import javax.jcr.security.Privilege; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.core.ItemImpl; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/FrozenNodeIteratorAdapter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/FrozenNodeIteratorAdapter.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/FrozenNodeIteratorAdapter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/FrozenNodeIteratorAdapter.java Thu Apr 30 12:14:29 2009 @@ -21,7 +21,7 @@ import javax.jcr.RepositoryException; import javax.jcr.version.VersionIterator; -import org.apache.jackrabbit.api.jsr283.version.Version; +import javax.jcr.version.Version; import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter; /** Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java Thu Apr 30 12:14:29 2009 @@ -18,7 +18,7 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.core.NodeId; -import org.apache.jackrabbit.api.jsr283.version.Version; +import javax.jcr.version.Version; import java.util.Calendar; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImpl.java Thu Apr 30 12:14:29 2009 @@ -30,20 +30,20 @@ import org.apache.jackrabbit.core.ItemValidator; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.security.authorization.Permission; -import org.apache.jackrabbit.api.jsr283.version.Version; -import org.apache.jackrabbit.api.jsr283.version.VersionHistory; +import javax.jcr.version.Version; +import javax.jcr.version.VersionHistory; import org.apache.jackrabbit.spi.commons.name.NameConstants; import org.apache.jackrabbit.uuid.UUID; import org.slf4j.LoggerFactory; import org.slf4j.Logger; /** - * Implementation of the {@link org.apache.jackrabbit.api.jsr283.version.VersionManager}. + * Implementation of the {@link javax.jcr.version.VersionManager}. *

* Note: For a cleaner architecture, we should probably rename the existing classes * that implement the internal version manager, and name this VersionManagerImpl. */ -public class JcrVersionManagerImpl implements org.apache.jackrabbit.api.jsr283.version.VersionManager { +public class JcrVersionManagerImpl implements javax.jcr.version.VersionManager { /** * default logger Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java Thu Apr 30 12:14:29 2009 @@ -24,8 +24,8 @@ import org.apache.jackrabbit.core.security.authorization.Permission; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.commons.conversion.NameException; -import org.apache.jackrabbit.api.jsr283.version.VersionHistory; -import org.apache.jackrabbit.api.jsr283.version.Version; +import javax.jcr.version.VersionHistory; +import javax.jcr.version.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java Thu Apr 30 12:14:29 2009 @@ -21,8 +21,8 @@ import org.apache.jackrabbit.core.NodeId; import org.apache.jackrabbit.core.NodeImpl; import org.apache.jackrabbit.core.SessionImpl; -import org.apache.jackrabbit.api.jsr283.version.Version; -import org.apache.jackrabbit.api.jsr283.version.VersionHistory; +import javax.jcr.version.Version; +import javax.jcr.version.VersionHistory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/RepositoryFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/RepositoryFactoryTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/RepositoryFactoryTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/RepositoryFactoryTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283; +package javax.jcr; import java.util.Collections; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/SessionRemoveItemTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/SessionRemoveItemTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/SessionRemoveItemTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/SessionRemoveItemTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283; +package javax.jcr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,14 +48,14 @@ if (superuser instanceof Session) { adminSession = (Session) superuser; } else { - throw new NotExecutableException("org.apache.jackrabbit.api.jsr283.Session expected."); + throw new NotExecutableException("javax.jcr.Session expected."); } javax.jcr.Session s = helper.getReadOnlySession(); if (s instanceof Session) { readOnlySession = (Session) s; } else { - throw new NotExecutableException("org.apache.jackrabbit.api.jsr283.Session expected."); + throw new NotExecutableException("javax.jcr.Session expected."); } removeNode = testRootNode.addNode(nodeName1, testNodeType); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283; +package javax.jcr; import junit.framework.TestCase; import junit.framework.Test; @@ -26,7 +26,7 @@ public class TestAll extends TestCase { public static Test suite() { - TestSuite suite = new TestSuite("org.apache.jackrabbit.api.jsr283 tests"); + TestSuite suite = new TestSuite("javax.jcr tests"); suite.addTestSuite(RepositoryFactoryTest.class); suite.addTestSuite(SessionRemoveItemTest.class); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/WorkspaceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/WorkspaceTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/WorkspaceTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/WorkspaceTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283; +package javax.jcr; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; @@ -42,7 +42,7 @@ } /** - * Tests {@link org.apache.jackrabbit.api.jsr283.Workspace#getLockManager()}. + * Tests {@link javax.jcr.Workspace#getLockManager()}. * * @throws RepositoryException */ Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/AbstractLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/AbstractLockTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/AbstractLockTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/AbstractLockTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,14 +101,14 @@ } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#isDeep()}. + * Test {@link javax.jcr.lock.Lock#isDeep()}. */ public void testIsDeep() { assertEquals("Lock.isDeep must be consistent with lock call.", isDeep(), lock.isDeep()); } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#getNode()}. + * Test {@link javax.jcr.lock.Lock#getNode()}. * * @throws RepositoryException If an execption occurs. */ @@ -137,14 +137,14 @@ } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#isSessionScoped()} + * Test {@link javax.jcr.lock.Lock#isSessionScoped()} */ public void testIsSessionScoped() { assertEquals("Lock.isSessionScoped must be consistent with lock call.", isSessionScoped(), lock.isSessionScoped()); } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#isLockOwningSession()} + * Test {@link javax.jcr.lock.Lock#isLockOwningSession()} * * @throws RepositoryException If an execption occurs. */ @@ -178,7 +178,7 @@ } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#getSecondsRemaining()} + * Test {@link javax.jcr.lock.Lock#getSecondsRemaining()} */ public void testGetSecondsRemaining() throws RepositoryException { if (lock.isLive()) { @@ -189,7 +189,7 @@ } /** - * Test {@link org.apache.jackrabbit.api.jsr283.lock.Lock#getSecondsRemaining()} + * Test {@link javax.jcr.lock.Lock#getSecondsRemaining()} */ public void testGetSecondsRemainingAfterUnlock() throws RepositoryException { lockMgr.unlock(lockedNode.getPath()); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/DeepLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/DeepLockTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/DeepLockTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/DeepLockTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import org.apache.jackrabbit.test.NotExecutableException; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/LockManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/LockManagerTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/LockManagerTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/LockManagerTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/OpenScopedLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/OpenScopedLockTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/OpenScopedLockTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/OpenScopedLockTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/SessionScopedLockTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/SessionScopedLockTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/SessionScopedLockTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/SessionScopedLockTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ } /** - * {@link org.apache.jackrabbit.api.jsr283.lock.Lock#getLockToken()} must + * {@link javax.jcr.lock.Lock#getLockToken()} must * always return null for session scoped locks. */ public void testGetLockToken() { Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/lock/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.lock; +package javax.jcr.lock; import junit.framework.TestCase; import junit.framework.Test; @@ -28,7 +28,7 @@ private static Logger log = LoggerFactory.getLogger(TestAll.class); public static Test suite() { - TestSuite suite = new TestSuite("org.apache.jackrabbit.api.jsr283.lock tests"); + TestSuite suite = new TestSuite("javax.jcr.lock tests"); suite.addTestSuite(LockManagerTest.class); suite.addTestSuite(OpenScopedLockTest.class); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AbstractObservationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AbstractObservationTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AbstractObservationTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AbstractObservationTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import java.util.Map; import java.util.Arrays; @@ -36,9 +36,9 @@ /** * TODO: remove when JSR 283 is final */ - protected static final int NODE_MOVED = org.apache.jackrabbit.api.jsr283.observation.Event.NODE_MOVED; + protected static final int NODE_MOVED = javax.jcr.observation.Event.NODE_MOVED; - protected static final int ALL_TYPES = Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED | org.apache.jackrabbit.api.jsr283.observation.Event.NODE_MOVED; + protected static final int ALL_TYPES = Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED | javax.jcr.observation.Event.NODE_MOVED; protected void setUserData(String userData) throws RepositoryException { // TODO: remove when JCR 2.0 is final @@ -47,27 +47,27 @@ protected static String getUserData(Event e) throws RepositoryException { // TODO: remove when JCR 2.0 is final - return ((org.apache.jackrabbit.api.jsr283.observation.Event) e).getUserData(); + return ((javax.jcr.observation.Event) e).getUserData(); } protected String getIdentifier(Node node) throws RepositoryException { // TODO: remove when JSR 283 is final - return ((org.apache.jackrabbit.api.jsr283.Node) node).getIdentifier(); + return ((javax.jcr.Node) node).getIdentifier(); } protected String getIdentifier(Event event) throws RepositoryException { // TODO: remove when JSR 283 is final - return ((org.apache.jackrabbit.api.jsr283.observation.Event) event).getIdentifier(); + return ((javax.jcr.observation.Event) event).getIdentifier(); } protected Map getInfo(Event event) throws RepositoryException { // TODO: remove when JSR 283 is final - return ((org.apache.jackrabbit.api.jsr283.observation.Event) event).getInfo(); + return ((javax.jcr.observation.Event) event).getInfo(); } protected long getDate(Event event) throws RepositoryException { // TODO: remove when JSR 283 is final - return ((org.apache.jackrabbit.api.jsr283.observation.Event) event).getDate(); + return ((javax.jcr.observation.Event) event).getDate(); } /** Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AddEventListenerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AddEventListenerTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AddEventListenerTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/AddEventListenerTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/EventJournalTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/EventJournalTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/EventJournalTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/EventJournalTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import java.util.Set; import java.util.HashSet; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetDateTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetDateTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetDateTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetDateTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import java.util.List; import java.util.Arrays; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetIdentifierTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetIdentifierTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetIdentifierTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetIdentifierTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetInfoTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetInfoTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetInfoTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetInfoTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetUserDataTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetUserDataTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetUserDataTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/GetUserDataTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeMovedTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeMovedTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeMovedTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeMovedTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import java.util.Map; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeReorderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeReorderTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeReorderTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/NodeReorderTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import java.util.Map; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/observation/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.observation; +package javax.jcr.observation; import junit.framework.TestCase; import junit.framework.Test; @@ -27,7 +27,7 @@ public class TestAll extends TestCase { public static Test suite() { - TestSuite suite = new TestSuite("org.apache.jackrabbit.api.jsr283.observation tests"); + TestSuite suite = new TestSuite("javax.jcr.observation tests"); suite.addTestSuite(AddEventListenerTest.class); suite.addTestSuite(EventJournalTest.class); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractJoinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractJoinTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractJoinTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractJoinTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.query.QueryResult; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractQOMTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractQOMTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractQOMTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/AbstractQOMTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import java.util.Set; import java.util.HashSet; @@ -26,7 +26,7 @@ import org.apache.jackrabbit.spi.commons.query.jsr283.qom.QueryObjectModelConstants; import org.apache.jackrabbit.core.query.QueryManagerImpl; import org.apache.jackrabbit.core.query.QueryImpl; -import org.apache.jackrabbit.api.jsr283.query.Row; +import javax.jcr.query.Row; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/BindVariableValueTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/BindVariableValueTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/BindVariableValueTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/BindVariableValueTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeJoinConditionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeJoinConditionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeJoinConditionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeJoinConditionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import java.util.List; import java.util.ArrayList; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ChildNodeTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeJoinConditionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeJoinConditionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeJoinConditionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeJoinConditionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import java.util.List; import java.util.ArrayList; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/DescendantNodeTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/EquiJoinConditionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/EquiJoinConditionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/EquiJoinConditionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/EquiJoinConditionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.Node; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/LengthTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/LengthTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/LengthTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/LengthTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeLocalNameTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeLocalNameTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeLocalNameTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeLocalNameTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.Value; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeNameTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeNameTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeNameTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/NodeNameTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.Value; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/PropertyExistenceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/PropertyExistenceTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/PropertyExistenceTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/PropertyExistenceTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.spi.commons.query.jsr283.qom.And; import org.apache.jackrabbit.spi.commons.query.jsr283.qom.PropertyExistence; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeJoinConditionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeJoinConditionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeJoinConditionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeJoinConditionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SameNodeTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SelectorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SelectorTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SelectorTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/SelectorTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import javax.jcr.RepositoryException; import javax.jcr.NodeIterator; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import junit.framework.Test; import junit.framework.TestCase; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/UpperLowerCaseTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/UpperLowerCaseTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/UpperLowerCaseTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/UpperLowerCaseTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.query.qom; +package javax.jcr.query.qom; import org.apache.jackrabbit.spi.commons.query.jsr283.qom.DynamicOperand; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; @@ -68,10 +68,10 @@ } } - protected static org.apache.jackrabbit.api.jsr283.Session getJsr283Session(Session s) throws NotExecutableException { + protected static javax.jcr.Session getJsr283Session(Session s) throws NotExecutableException { // TODO: get rid of method once jsr 283 is released - if (s instanceof org.apache.jackrabbit.api.jsr283.Session) { - return (org.apache.jackrabbit.api.jsr283.Session) s; + if (s instanceof javax.jcr.Session) { + return (javax.jcr.Session) s; } else { throw new NotExecutableException(); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldEffectTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldEffectTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldEffectTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldEffectTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import org.apache.jackrabbit.test.NotExecutableException; import org.apache.jackrabbit.test.RepositoryStub; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyEffectTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyEffectTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyEffectTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyEffectTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import org.apache.jackrabbit.test.NotExecutableException; import org.apache.jackrabbit.test.RepositoryStub; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.retention; +package javax.jcr.retention; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; /** - * Test suite that includes all testcases for package org.apache.jackrabbit.api.jsr283.retention. + * Test suite that includes all testcases for package javax.jcr.retention. */ public class TestAll extends TestCase { @@ -30,7 +30,7 @@ * package. */ public static Test suite() { - TestSuite suite = new TestSuite("org.apache.jackrabbit.api.jsr283.retention tests"); + TestSuite suite = new TestSuite("javax.jcr.retention tests"); suite.addTestSuite(HoldTest.class); suite.addTestSuite(HoldEffectTest.class); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AbstractAccessControlTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AbstractAccessControlTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AbstractAccessControlTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AbstractAccessControlTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.test.AbstractJCRTest; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlDiscoveryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlDiscoveryTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlDiscoveryTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlDiscoveryTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.test.NotExecutableException; import org.apache.jackrabbit.spi.Name; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlListTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlListTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlListTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.core.SessionImpl; import org.apache.jackrabbit.core.security.TestPrincipal; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyIteratorTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyIteratorTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyIteratorTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyIteratorTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.test.NotExecutableException; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/AccessControlPolicyTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.test.NotExecutableException; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlDiscoveryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlDiscoveryTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlDiscoveryTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlDiscoveryTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.test.NotExecutableException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlPolicyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlPolicyTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlPolicyTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlPolicyTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.apache.jackrabbit.test.NotExecutableException; import org.slf4j.Logger; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/RSessionAccessControlTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/security/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.security; +package javax.jcr.security; import junit.framework.Test; import junit.framework.TestCase; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/AbstractVersionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/AbstractVersionTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/AbstractVersionTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/AbstractVersionTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import org.apache.jackrabbit.test.AbstractJCRTest; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/BasicTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/BasicTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/BasicTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/BasicTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckinTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckinTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckinTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import javax.jcr.version.Version; import javax.jcr.RepositoryException; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckoutTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckoutTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckoutTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CheckoutTest.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import javax.jcr.RepositoryException; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CopyTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CopyTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CopyTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/CopyTest.java Thu Apr 30 12:14:29 2009 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import javax.jcr.RepositoryException; -import org.apache.jackrabbit.api.jsr283.Workspace; -import org.apache.jackrabbit.api.jsr283.Node; -import org.apache.jackrabbit.api.jsr283.version.VersionManager; -import org.apache.jackrabbit.api.jsr283.version.VersionHistory; +import javax.jcr.Workspace; +import javax.jcr.Node; +import javax.jcr.version.VersionManager; +import javax.jcr.version.VersionHistory; /** * CopyTest checks if simple versionable nodes are copied correctly: @@ -36,7 +36,7 @@ * * @test * @sources CopyTest.java - * @executeClass org.apache.jackrabbit.api.jsr283.version.simple.CopyTest + * @executeClass javax.jcr.version.simple.CopyTest * @keywords simple-versioning */ public class CopyTest extends AbstractVersionTest { @@ -53,7 +53,7 @@ wsp.copy(srcPath, dstPath); // check versionable - Node v = (Node) ((org.apache.jackrabbit.api.jsr283.Session) superuser).getNode(dstPath); + Node v = (Node) ((javax.jcr.Session) superuser).getNode(dstPath); assertTrue("Copied Node.isNodeType(mix:simpleVersionable) must return true.", v.isNodeType(mixSimpleVersionable)); assertFalse("Copied Node.isNodeType(mix:versionable) must return false.", @@ -72,7 +72,7 @@ // remove copied node try { String dstPath = getProperty("destination"); - ((org.apache.jackrabbit.api.jsr283.Session) superuser).getNode(dstPath).remove(); + ((javax.jcr.Session) superuser).getNode(dstPath).remove(); testRootNode.save(); } catch (Exception e) { log.println("Exception in tearDown: " + e.toString()); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/FrozenNodeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/FrozenNodeTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/FrozenNodeTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/FrozenNodeTest.java Thu Apr 30 12:14:29 2009 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.jackrabbit.api.jsr283.version.Version; +import javax.jcr.version.Version; /** * SVFrozenNodeTest covers tests related to frozen nodes in Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/RestoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/RestoreTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/RestoreTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/RestoreTest.java Thu Apr 30 12:14:29 2009 @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import org.apache.jackrabbit.test.NotExecutableException; -import org.apache.jackrabbit.api.jsr283.version.VersionHistory; +import javax.jcr.version.VersionHistory; import javax.jcr.nodetype.NodeDefinition; import javax.jcr.version.Version; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/TestAll.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/TestAll.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/version/simple/TestAll.java Thu Apr 30 12:14:29 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.api.jsr283.version.simple; +package javax.jcr.version.simple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +29,7 @@ private static Logger log = LoggerFactory.getLogger(TestAll.class); public static Test suite() { - TestSuite suite = new TestSuite("org.apache.jackrabbit.api.jsr283.version.simple tests"); + TestSuite suite = new TestSuite("javax.jcr.version.simple tests"); suite.addTestSuite(BasicTest.class); suite.addTestSuite(CheckinTest.class); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java Thu Apr 30 12:14:29 2009 @@ -20,10 +20,10 @@ import org.slf4j.LoggerFactory; import org.apache.jackrabbit.test.AbstractJCRTest; import org.apache.jackrabbit.test.NotExecutableException; -import org.apache.jackrabbit.api.jsr283.security.AccessControlManager; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicyIterator; -import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy; -import org.apache.jackrabbit.api.jsr283.security.Privilege; +import javax.jcr.security.AccessControlManager; +import javax.jcr.security.AccessControlPolicyIterator; +import javax.jcr.security.AccessControlPolicy; +import javax.jcr.security.Privilege; import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList; import javax.jcr.Node; Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java?rev=770187&r1=770186&r2=770187&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java Thu Apr 30 12:14:29 2009 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.core; -import org.apache.jackrabbit.api.jsr283.retention.AbstractRetentionTest; -import org.apache.jackrabbit.api.jsr283.retention.Hold; +import javax.jcr.retention.AbstractRetentionTest; +import javax.jcr.retention.Hold; import org.apache.jackrabbit.core.retention.RetentionRegistryImpl; import org.apache.jackrabbit.core.retention.RetentionRegistry; import org.apache.jackrabbit.core.fs.FileSystem;