You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/04/30 14:14:34 UTC
svn commit: r770187 [3/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...
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java Thu Apr 30 12:14:29 2009
@@ -28,7 +28,7 @@
import javax.naming.Context;
import javax.imageio.spi.ServiceRegistry;
-import org.apache.jackrabbit.api.jsr283.RepositoryFactory;
+import javax.jcr.RepositoryFactory;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.core.RepositoryFactoryImpl;
import org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/ShareableNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/ShareableNodesTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/ShareableNodesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/ShareableNodesTest.java Thu Apr 30 12:14:29 2009
@@ -23,7 +23,7 @@
import org.apache.jackrabbit.test.api.observation.EventResult;
import org.apache.jackrabbit.core.NodeImpl;
-import org.apache.jackrabbit.api.jsr283.observation.AbstractObservationTest;
+import javax.jcr.observation.AbstractObservationTest;
/**
* <code>ShareableNodesTest</code>...
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java Thu Apr 30 12:14:29 2009
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.core.query;
-import org.apache.jackrabbit.api.jsr283.security.AbstractAccessControlTest;
-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.AbstractAccessControlTest;
+import javax.jcr.security.AccessControlPolicyIterator;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.api.JackrabbitSession;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/HoldTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/HoldTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/HoldTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/HoldTest.java Thu Apr 30 12:14:29 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.retention;
-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.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/RetentionPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/RetentionPolicyTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/RetentionPolicyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/retention/RetentionPolicyTest.java Thu Apr 30 12:14:29 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.retention;
-import org.apache.jackrabbit.api.jsr283.retention.AbstractRetentionTest;
-import org.apache.jackrabbit.api.jsr283.retention.RetentionPolicy;
+import javax.jcr.retention.AbstractRetentionTest;
+import javax.jcr.retention.RetentionPolicy;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java Thu Apr 30 12:14:29 2009
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.security.authentication;
-import org.apache.jackrabbit.api.jsr283.GuestCredentials;
+import javax.jcr.GuestCredentials;
import org.apache.jackrabbit.test.AbstractJCRTest;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplateTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplateTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractACLTemplateTest.java Thu Apr 30 12:14:29 2009
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-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.AbstractAccessControlTest;
+import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
+import javax.jcr.security.AbstractAccessControlTest;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEntryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEntryTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEntryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEntryTest.java Thu Apr 30 12:14:29 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlException;
-import org.apache.jackrabbit.api.jsr283.security.AbstractAccessControlTest;
+import javax.jcr.security.Privilege;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.AbstractAccessControlTest;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java Thu Apr 30 12:14:29 2009
@@ -18,10 +18,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.api.jsr283.security.AbstractAccessControlTest;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AbstractAccessControlTest;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.api.JackrabbitSession;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractLockManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractLockManagementTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractLockManagementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractLockManagementTest.java Thu Apr 30 12:14:29 2009
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.AccessDeniedException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractNodeTypeManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractNodeTypeManagementTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractNodeTypeManagementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractNodeTypeManagementTest.java Thu Apr 30 12:14:29 2009
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.AccessDeniedException;
@@ -101,14 +101,14 @@
// TODO: remove casts once jsr 283 is released.
String changedNtName = "nt:folder";
- ((org.apache.jackrabbit.api.jsr283.Node) child).setPrimaryType(changedNtName);
+ ((javax.jcr.Node) child).setPrimaryType(changedNtName);
child.save();
try {
checkReadOnly(childNode.getPath());
try {
- ((org.apache.jackrabbit.api.jsr283.Node) childNode).setPrimaryType(ntName);
+ ((javax.jcr.Node) childNode).setPrimaryType(ntName);
childNode.save();
fail("TestSession does not have sufficient privileges to change the primary type.");
} catch (AccessDeniedException e) {
@@ -122,7 +122,7 @@
*/
modifyPrivileges(childNode.getPath(), Privilege.JCR_NODE_TYPE_MANAGEMENT, true);
try {
- ((org.apache.jackrabbit.api.jsr283.Node) childNode).setPrimaryType(ntName);
+ ((javax.jcr.Node) childNode).setPrimaryType(ntName);
childNode.save();
fail("TestSession does not have sufficient privileges to change the primary type.");
} catch (AccessDeniedException e) {
@@ -132,12 +132,12 @@
// with complete write permission the call must succeed.
modifyPrivileges(childNode.getPath(), Privilege.JCR_MODIFY_PROPERTIES, true);
- ((org.apache.jackrabbit.api.jsr283.Node) childNode).setPrimaryType(ntName);
+ ((javax.jcr.Node) childNode).setPrimaryType(ntName);
childNode.save();
} finally {
if (!ntName.equals(child.getPrimaryNodeType().getName())) {
- ((org.apache.jackrabbit.api.jsr283.Node) child).setPrimaryType(ntName);
+ ((javax.jcr.Node) child).setPrimaryType(ntName);
child.save();
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractVersionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractVersionManagementTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractVersionManagementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractVersionManagementTest.java Thu Apr 30 12:14:29 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry;
+import javax.jcr.security.Privilege;
+import javax.jcr.security.AccessControlEntry;
import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java Thu Apr 30 12:14:29 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.security.authorization;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-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.AccessControlPolicy;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.core.SessionImpl;
@@ -405,9 +405,9 @@
- add-node
- remove.
*/
- String aActions = org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY + "," + org.apache.jackrabbit.api.jsr283.Session.ACTION_READ;
+ String aActions = javax.jcr.Session.ACTION_SET_PROPERTY + "," + javax.jcr.Session.ACTION_READ;
assertTrue(testSession.hasPermission(childNPath, aActions));
- String dActions = org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE + "," + org.apache.jackrabbit.api.jsr283.Session.ACTION_ADD_NODE;
+ String dActions = javax.jcr.Session.ACTION_REMOVE + "," + javax.jcr.Session.ACTION_ADD_NODE;
assertFalse(testSession.hasPermission(childNPath, dActions));
/*
@@ -450,8 +450,8 @@
- neither node at path nor at childNPath can be removed since
REMOVE_NODE privilege is missing.
*/
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
- assertFalse(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
}
public void testRemovePermission2() throws NotExecutableException, RepositoryException {
@@ -472,8 +472,8 @@
- neither node at path nor at childNPath can be removed permission
due to missing remove_child_nodes privilege.
*/
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
- assertFalse(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
}
public void testRemovePermission3() throws NotExecutableException, RepositoryException {
@@ -500,8 +500,8 @@
- privileges: both at path and at childNPath 'remove_node' and
'remove_child_nodes' are present.
*/
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
- assertTrue(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_REMOVE));
+ assertTrue(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(path, privs));
assertTrue(testAcMgr.hasPrivileges(childNPath, privs));
@@ -530,8 +530,8 @@
- remove-permission present for node at childNPath
- both remove_node and remove_childNodes privilege present at childNPath
*/
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
- assertTrue(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_REMOVE));
+ assertTrue(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(childNPath, new Privilege[] {rmChildNodes[0], rmNode[0]}));
}
@@ -551,7 +551,7 @@
expected result:
- node at childNPath can't be removed since REMOVE_CHILD_NODES is missing.
*/
- assertFalse(getTestSession().hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(getTestSession().hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
}
public void testRemovePermission6() throws NotExecutableException, RepositoryException {
@@ -579,8 +579,8 @@
- no remove_node privilege at childNPath
- read, remove_child_nodes privilege at childNPath
*/
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
- assertFalse(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(childNPath, privilegesFromNames(new String[] {Privilege.JCR_READ, Privilege.JCR_REMOVE_CHILD_NODES})));
assertFalse(testAcMgr.hasPrivileges(childNPath, privilegesFromName(Privilege.JCR_REMOVE_NODE)));
}
@@ -606,7 +606,7 @@
expected result:
- node at childNPath can't be removed.
*/
- assertFalse(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
// additionally add remove_child_nodes priv at 'childNPath'
givePrivileges(childNPath, rmChildNodes, getRestrictions(superuser, childNPath));
@@ -615,7 +615,7 @@
- node at childNPath still can't be removed.
- but both privileges (remove_node, remove_child_nodes) are present.
*/
- assertFalse(testSession.hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(testSession.hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(childNPath, new Privilege[] {rmChildNodes[0], rmNode[0]}));
}
@@ -641,7 +641,7 @@
expected result:
- remove permission must be granted at childNPath
*/
- assertTrue(getTestSession().hasPermission(childNPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertTrue(getTestSession().hasPermission(childNPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(childNPath, new Privilege[] {rmChildNodes[0], rmNode[0]}));
}
@@ -763,7 +763,7 @@
/* testuser must get the permissions/privileges inherited from
the group it is member of.
*/
- String actions = org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY + "," + org.apache.jackrabbit.api.jsr283.Session.ACTION_READ;
+ String actions = javax.jcr.Session.ACTION_SET_PROPERTY + "," + javax.jcr.Session.ACTION_READ;
assertTrue(getTestSession().hasPermission(path, actions));
Privilege[] privs = privilegesFromName(Privilege.JCR_MODIFY_PROPERTIES);
@@ -788,7 +788,7 @@
since user-permissions overrule the group permissions, testuser must
not have set_property action / modify_properties privilege.
*/
- String actions = org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY;
+ String actions = javax.jcr.Session.ACTION_SET_PROPERTY;
assertFalse(getTestSession().hasPermission(path, actions));
assertFalse(testAcMgr.hasPrivileges(path, privilegesFromName(Privilege.JCR_MODIFY_PROPERTIES)));
}
@@ -813,7 +813,7 @@
Privilege[] privs = testAcMgr.getPrivileges(childPath);
assertEquals(PrivilegeRegistry.getBits(privilegesFromName(Privilege.JCR_READ)),
PrivilegeRegistry.getBits(privs));
- getTestSession().checkPermission(childPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_READ);
+ getTestSession().checkPermission(childPath, javax.jcr.Session.ACTION_READ);
}
public void testNonExistingItem() throws RepositoryException, NotExecutableException {
@@ -824,7 +824,7 @@
Session testSession = getTestSession();
String rootPath = testSession.getRootNode().getPath();
checkReadOnly(rootPath);
- testSession.checkPermission(rootPath + "nonExistingItem", org.apache.jackrabbit.api.jsr283.Session.ACTION_READ);
+ testSession.checkPermission(rootPath + "nonExistingItem", javax.jcr.Session.ACTION_READ);
}
public void testACItemsAreProtected() throws NotExecutableException, RepositoryException {
@@ -898,10 +898,10 @@
- testSession can add child-nodes below path
*/
SessionImpl testSession = getTestSession();
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_ADD_NODE));
- assertTrue(testSession.hasPermission(path+"/anychild", org.apache.jackrabbit.api.jsr283.Session.ACTION_ADD_NODE));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_ADD_NODE));
+ assertTrue(testSession.hasPermission(path+"/anychild", javax.jcr.Session.ACTION_ADD_NODE));
String childPath = n.getPath();
- assertTrue(testSession.hasPermission(childPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_ADD_NODE));
+ assertTrue(testSession.hasPermission(childPath, javax.jcr.Session.ACTION_ADD_NODE));
}
public void testAclReferingToRemovedPrincipal() throws
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/JackrabbitAccessControlListTest.java Thu Apr 30 12:14:29 2009
@@ -17,11 +17,11 @@
package org.apache.jackrabbit.core.security.authorization;
import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.jsr283.security.AbstractAccessControlTest;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicyIterator;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AbstractAccessControlTest;
+import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlPolicyIterator;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.test.NotExecutableException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistryTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/PrivilegeRegistryTest.java Thu Apr 30 12:14:29 2009
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.core.security.authorization;
import junit.framework.TestCase;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlException;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.spi.commons.conversion.ParsingNameResolver;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.spi.commons.name.NameFactoryImpl;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplateTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplateTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/ACLTemplateTest.java Thu Apr 30 12:14:29 2009
@@ -17,9 +17,9 @@
package org.apache.jackrabbit.core.security.authorization.acl;
import org.apache.jackrabbit.api.JackrabbitSession;
-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 javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.core.security.authorization.AbstractACLTemplateTest;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EntryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EntryTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EntryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EntryTest.java Thu Apr 30 12:14:29 2009
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.core.security.authorization.acl;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.core.security.authorization.AbstractEntryTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlEntry;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EvaluationUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EvaluationUtil.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EvaluationUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/EvaluationUtil.java Thu Apr 30 12:14:29 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.security.authorization.acl;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicyIterator;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlPolicyIterator;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.apache.jackrabbit.test.NotExecutableException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/LockTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/LockTest.java Thu Apr 30 12:14:29 2009
@@ -18,7 +18,7 @@
import org.apache.jackrabbit.core.security.authorization.AbstractLockManagementTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
+import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/NodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/NodeTypeTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/NodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/NodeTypeTest.java Thu Apr 30 12:14:29 2009
@@ -18,7 +18,7 @@
import org.apache.jackrabbit.core.security.authorization.AbstractNodeTypeManagementTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
+import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/VersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/VersionTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/VersionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/VersionTest.java Thu Apr 30 12:14:29 2009
@@ -18,7 +18,7 @@
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.apache.jackrabbit.core.security.authorization.AbstractVersionManagementTest;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
+import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/WriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/WriteTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/WriteTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/acl/WriteTest.java Thu Apr 30 12:14:29 2009
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.core.security.authorization.acl;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicyIterator;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlPolicyIterator;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.core.security.authorization.AbstractWriteTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.apache.jackrabbit.core.security.authorization.PrivilegeRegistry;
@@ -171,7 +171,7 @@
content that requires jcr:modifyAccessControl privilege instead.
*/
String policyPath = childNPath + "/rep:policy";
- assertFalse(getTestSession().hasPermission(policyPath, org.apache.jackrabbit.api.jsr283.Session.ACTION_REMOVE));
+ assertFalse(getTestSession().hasPermission(policyPath, javax.jcr.Session.ACTION_REMOVE));
assertTrue(testAcMgr.hasPrivileges(policyPath, new Privilege[] {rmChildNodes[0], rmNode[0]}));
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/combined/WriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/combined/WriteTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/combined/WriteTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/combined/WriteTest.java Thu Apr 30 12:14:29 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.security.authorization.combined;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-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.AccessControlPolicy;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.JackrabbitAccessControlManager;
@@ -130,7 +130,7 @@
- nodebased wins over principalbased -> READ is denied
*/
assertFalse(testSession.itemExists(path));
- assertFalse(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_READ));
+ assertFalse(testSession.hasPermission(path, javax.jcr.Session.ACTION_READ));
assertFalse(testAcMgr.hasPrivileges(path, readPrivs));
// remove the nodebased policy
@@ -143,7 +143,7 @@
- READ privilege is present again.
*/
assertTrue(testSession.itemExists(path));
- assertTrue(testSession.hasPermission(path, org.apache.jackrabbit.api.jsr283.Session.ACTION_READ));
+ assertTrue(testSession.hasPermission(path, javax.jcr.Session.ACTION_READ));
assertTrue(testAcMgr.hasPrivileges(path, readPrivs));
// nodebased: add WRITE privilege for 'testUser' at 'path'
@@ -156,7 +156,7 @@
expected result:
- MODIFY_PROPERTIES privilege still present
*/
- assertTrue(testSession.hasPermission(path+"/anyproperty", org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY));
+ assertTrue(testSession.hasPermission(path+"/anyproperty", javax.jcr.Session.ACTION_SET_PROPERTY));
assertTrue(testAcMgr.hasPrivileges(path, wrtPrivileges));
// nodebased: deny MODIFY_PROPERTIES privileges for 'testUser'
@@ -167,10 +167,10 @@
- MODIFY_PROPERTIES privilege still present at 'path'
- no-MODIFY_PROPERTIES privilege at 'childNPath'
*/
- assertTrue(testSession.hasPermission(path+"/anyproperty", org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY));
+ assertTrue(testSession.hasPermission(path+"/anyproperty", javax.jcr.Session.ACTION_SET_PROPERTY));
assertTrue(testAcMgr.hasPrivileges(path, modPropPrivs));
- assertFalse(testSession.hasPermission(childNPath+"/anyproperty", org.apache.jackrabbit.api.jsr283.Session.ACTION_SET_PROPERTY));
+ assertFalse(testSession.hasPermission(childNPath+"/anyproperty", javax.jcr.Session.ACTION_SET_PROPERTY));
assertFalse(testAcMgr.hasPrivileges(childNPath, modPropPrivs));
}
}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntryTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EntryTest.java Thu Apr 30 12:14:29 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.security.authorization.principalbased;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlException;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AccessControlException;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.authorization.AbstractEntryTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlEntry;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EvaluationUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EvaluationUtil.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EvaluationUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/EvaluationUtil.java Thu Apr 30 12:14:29 2009
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.core.security.authorization.principalbased;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/LockTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/LockTest.java Thu Apr 30 12:14:29 2009
@@ -19,7 +19,7 @@
import org.apache.jackrabbit.core.security.authorization.AbstractLockManagementTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
+import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/NodeTypeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/NodeTypeTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/NodeTypeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/NodeTypeTest.java Thu Apr 30 12:14:29 2009
@@ -19,7 +19,7 @@
import org.apache.jackrabbit.core.security.authorization.AbstractNodeTypeManagementTest;
import org.apache.jackrabbit.core.security.authorization.JackrabbitAccessControlList;
import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
+import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.test.NotExecutableException;
import javax.jcr.RepositoryException;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/VersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/VersionTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/VersionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/VersionTest.java Thu Apr 30 12:14:29 2009
@@ -20,8 +20,8 @@
import org.apache.jackrabbit.core.security.authorization.AbstractVersionManagementTest;
import org.apache.jackrabbit.core.security.authorization.PrivilegeRegistry;
import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/WriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/WriteTest.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/WriteTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/principalbased/WriteTest.java Thu Apr 30 12:14:29 2009
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.core.security.authorization.principalbased;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-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.AccessControlPolicy;
+import javax.jcr.security.Privilege;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.core.security.authorization.AbstractWriteTest;
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java Thu Apr 30 12:14:29 2009
@@ -95,12 +95,12 @@
public String getToken() {
String token = lock.getLockToken();
if (token == null && lock.isSessionScoped()
- && lock instanceof org.apache.jackrabbit.api.jsr283.lock.Lock
- && ((org.apache.jackrabbit.api.jsr283.lock.Lock)lock).isLockOwningSession()) {
+ && lock instanceof javax.jcr.lock.Lock
+ && ((javax.jcr.lock.Lock)lock).isLockOwningSession()) {
// special handling for session scoped locks that are owned by the
// current session but never expose their token with jsr 283.
try {
- token = ((org.apache.jackrabbit.api.jsr283.Node)lock.getNode()).getIdentifier();
+ token = ((javax.jcr.Node)lock.getNode()).getIdentifier();
} catch (RepositoryException e) {
// should never get here
log.warn("Unexpected error while retrieving node identifier for building a DAV specific lock token.",e.getMessage());
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java Thu Apr 30 12:14:29 2009
@@ -636,8 +636,8 @@
String itemPath = member.getLocator().getRepositoryPath();
Item memItem = getJcrSession().getItem(itemPath);
//TODO once jcr2 is out: simply call removeShare()
- if (memItem instanceof org.apache.jackrabbit.api.jsr283.Node) {
- org.apache.jackrabbit.api.jsr283.Node n = (org.apache.jackrabbit.api.jsr283.Node) memItem;
+ if (memItem instanceof javax.jcr.Node) {
+ javax.jcr.Node n = (javax.jcr.Node) memItem;
n.removeShare();
} else {
memItem.remove();
@@ -938,13 +938,13 @@
try {
if (node.getDepth() > 0) {
//TODO remove this check once jcr2 is out
- if (!(node instanceof org.apache.jackrabbit.api.jsr283.Node)) {
+ if (!(node instanceof javax.jcr.Node)) {
DavResourceLocator loc = locator.getFactory().createResourceLocator(
locator.getPrefix(), locator.getWorkspacePath(), node.getParent().getPath(), false);
return Collections.singleton(new ParentElement(loc.getHref(true), node.getName()));
}
Set ps = new HashSet();
- NodeIterator sharedSetIterator = ((org.apache.jackrabbit.api.jsr283.Node) node).getSharedSet();
+ NodeIterator sharedSetIterator = ((javax.jcr.Node) node).getSharedSet();
while (sharedSetIterator.hasNext()) {
Node sharednode = sharedSetIterator.nextNode();
DavResourceLocator loc = locator.getFactory().createResourceLocator(
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java Thu Apr 30 12:14:29 2009
@@ -54,7 +54,7 @@
* <code>LockManagerImpl</code>...
* TODO: TOBEFIXED. Lock objects obtained through this mgr are not informed if another session is or becomes lock-holder and removes the lock again.
*/
-public class LockManagerImpl implements LockManager, org.apache.jackrabbit.api.jsr283.lock.LockManager, SessionListener {
+public class LockManagerImpl implements LockManager, javax.jcr.lock.LockManager, SessionListener {
private static Logger log = LoggerFactory.getLogger(LockManagerImpl.class);
@@ -93,15 +93,15 @@
//--------------------------------------------------------< LockManager >---
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.LockManager#getLock(String)
+ * @see javax.jcr.lock.LockManager#getLock(String)
*/
- public org.apache.jackrabbit.api.jsr283.lock.Lock getLock(String absPath) throws LockException, RepositoryException {
+ public javax.jcr.lock.Lock getLock(String absPath) throws LockException, RepositoryException {
Node n = itemManager.getNode(resolver.getQPath(absPath));
- return (org.apache.jackrabbit.api.jsr283.lock.Lock) n.getLock();
+ return (javax.jcr.lock.Lock) n.getLock();
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.LockManager#isLocked(String)
+ * @see javax.jcr.lock.LockManager#isLocked(String)
*/
public boolean isLocked(String absPath) throws RepositoryException {
Node n = itemManager.getNode(resolver.getQPath(absPath));
@@ -109,7 +109,7 @@
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.LockManager#holdsLock(String)
+ * @see javax.jcr.lock.LockManager#holdsLock(String)
*/
public boolean holdsLock(String absPath) throws RepositoryException {
Node n = itemManager.getNode(resolver.getQPath(absPath));
@@ -117,15 +117,15 @@
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.LockManager#lock(String, boolean, boolean, long, String)
+ * @see javax.jcr.lock.LockManager#lock(String, boolean, boolean, long, String)
*/
- public org.apache.jackrabbit.api.jsr283.lock.Lock lock(String absPath, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerInfo) throws RepositoryException {
+ public javax.jcr.lock.Lock lock(String absPath, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerInfo) throws RepositoryException {
Node n = itemManager.getNode(resolver.getQPath(absPath));
- return (org.apache.jackrabbit.api.jsr283.lock.Lock) ((NodeImpl) n).lock(isDeep, isSessionScoped, timeoutHint, ownerInfo);
+ return (javax.jcr.lock.Lock) ((NodeImpl) n).lock(isDeep, isSessionScoped, timeoutHint, ownerInfo);
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.LockManager#unlock(String)
+ * @see javax.jcr.lock.LockManager#unlock(String)
*/
public void unlock(String absPath) throws LockException, RepositoryException {
Node n = itemManager.getNode(resolver.getQPath(absPath));
@@ -702,7 +702,7 @@
/**
* Inner class implementing the {@link Lock} interface.
*/
- private class LockImpl implements org.apache.jackrabbit.api.jsr283.lock.Lock, LockTokenListener {
+ private class LockImpl implements javax.jcr.lock.Lock, LockTokenListener {
private final LockState lockState;
private final Node node;
@@ -806,7 +806,7 @@
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.Lock#getSecondsRemaining()
+ * @see javax.jcr.lock.Lock#getSecondsRemaining()
*/
public long getSecondsRemaining() throws RepositoryException {
updateLockInfo();
@@ -814,7 +814,7 @@
}
/**
- * @see org.apache.jackrabbit.api.jsr283.lock.Lock#isLockOwningSession()
+ * @see javax.jcr.lock.Lock#isLockOwningSession()
*/
public boolean isLockOwningSession(){
return lockState.lockInfo.isLockOwner();
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/LockInfoImpl.java Thu Apr 30 12:14:29 2009
@@ -53,7 +53,7 @@
* @throws RepositoryException If an error occurs while creating the info.
* @since JCR 2.0
*/
- private LockInfoImpl(org.apache.jackrabbit.api.jsr283.lock.Lock lock,
+ private LockInfoImpl(javax.jcr.lock.Lock lock,
IdFactoryImpl idFactory, NamePathResolver resolver) throws RepositoryException {
super(lock.getLockToken(), lock.getLockOwner(), lock.isDeep(), lock.isSessionScoped(), lock.getSecondsRemaining(), lock.isLockOwningSession(), idFactory.createNodeId(lock.getNode(), resolver));
}
@@ -68,8 +68,8 @@
* @throws RepositoryException If an error occurs while creating the info.
*/
public static LockInfo createLockInfo(Lock lock, IdFactoryImpl idFactory, NamePathResolver resolver) throws RepositoryException {
- if (lock instanceof org.apache.jackrabbit.api.jsr283.lock.Lock) {
- return new LockInfoImpl((org.apache.jackrabbit.api.jsr283.lock.Lock) lock, idFactory, resolver);
+ if (lock instanceof javax.jcr.lock.Lock) {
+ return new LockInfoImpl((javax.jcr.lock.Lock) lock, idFactory, resolver);
} else {
return new LockInfoImpl(lock, idFactory, resolver);
}
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java?rev=770187&r1=770186&r2=770187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/RepositoryServiceImpl.java Thu Apr 30 12:14:29 2009
@@ -580,8 +580,8 @@
Node n = getNode(nodeId, sInfo);
Lock lock;
// TODO: remove check once jsr283 is released
- if (sInfo.getSession() instanceof org.apache.jackrabbit.api.jsr283.Session) {
- org.apache.jackrabbit.api.jsr283.lock.LockManager lMgr = (((org.apache.jackrabbit.api.jsr283.Workspace) sInfo.getSession().getWorkspace()).getLockManager());
+ if (sInfo.getSession() instanceof javax.jcr.Session) {
+ javax.jcr.lock.LockManager lMgr = (((javax.jcr.Workspace) sInfo.getSession().getWorkspace()).getLockManager());
lock = lMgr.lock(n.getPath(), deep, sessionScoped, timeoutHint, ownerHint);
} else {
lock = n.lock(deep, sessionScoped);