[exo-jcr-commits] exo-jcr SVN: r5478 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access and 13 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Jan 18 04:04:20 EST 2012
Author: andrew.plotnikov
Date: 2012-01-18 04:04:15 -0500 (Wed, 18 Jan 2012)
New Revision: 5478
Removed:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/SystemIdentity.java
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/PermissionValue.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/reading/TestProperty.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccess.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessChildNodes.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessUpdateMixin.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestPermissions.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestUserAccess.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/TestExternalizabeItemData.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
Log:
EXOJCR-1722: Remove deprecated SystemIdentity class
Modified: jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/developer-notes.txt 2012-01-18 09:04:15 UTC (rev 5478)
@@ -6,4 +6,5 @@
* If lock manager is not configured we will have RepositoryConfigurationException at startup
* Index JCR_XITEM_PARENT_NAME removed (JCR_IDX_MITEM_PN - for DB2)
* Index JCR_IDX_XITEM_PARENT_N_ORDER_NUM from MySQL scripts.
-* We will have RepositoryException when use Session or Node after session.logout
\ No newline at end of file
+* We will have RepositoryException when use Session or Node after session.logout
+* Removed SystemIdentity class
\ No newline at end of file
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessControlList.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -20,6 +20,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import java.io.Externalizable;
import java.io.IOException;
@@ -54,7 +55,7 @@
public AccessControlList()
{
- this(SystemIdentity.SYSTEM);
+ this(IdentityConstants.SYSTEM);
}
/**
@@ -69,7 +70,7 @@
this.accessList = new ArrayList<AccessControlEntry>();
for (String str : PermissionType.ALL)
{
- accessList.add(new AccessControlEntry(SystemIdentity.ANY, str));
+ accessList.add(new AccessControlEntry(IdentityConstants.ANY, str));
}
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessManager.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/AccessManager.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -25,6 +25,7 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import java.util.ArrayList;
import java.util.HashMap;
@@ -106,7 +107,7 @@
String userId = user.getUserId();
- if (userId.equals(SystemIdentity.SYSTEM))
+ if (userId.equals(IdentityConstants.SYSTEM))
{
// SYSTEM has permission everywhere
return true;
@@ -116,9 +117,9 @@
// Current user is owner of node so has all privileges
return true;
}
- else if (userId.equals(SystemIdentity.ANONIM))
+ else if (userId.equals(IdentityConstants.ANONIM))
{
- List<String> anyPermissions = acl.getPermissions(SystemIdentity.ANY);
+ List<String> anyPermissions = acl.getPermissions(IdentityConstants.ANY);
if (anyPermissions.size() < permission.length)
return false;
@@ -182,7 +183,7 @@
if (ace.getPermission().equals(testPermission))
{
// match any
- if (ace.getIdentity().equals(SystemIdentity.ANY))
+ if (ace.getIdentity().equals(IdentityConstants.ANY))
return true;
else if (ace.getIdentity().indexOf(":") == -1)
{
Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/SystemIdentity.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/SystemIdentity.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/access/SystemIdentity.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.jcr.access;
-
-import org.exoplatform.services.security.IdentityConstants;
-
-/**
- * Created by The eXo Platform SAS.
- * Please use {@link IdentityConstants} instead.
- *
- * @author <a href="mailto:gennady.azarenkov at exoplatform.com">Gennady Azarenkov</a>
- * @version $Id: SystemIdentity.java 11907 2008-03-13 15:36:21Z ksm $
- */
-
- at Deprecated
-public class SystemIdentity extends IdentityConstants
-{
-
-}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -21,7 +21,6 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.AccessControlList;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.ExtendedNode;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
import org.exoplatform.services.jcr.core.nodetype.ItemDefinitionData;
@@ -65,6 +64,7 @@
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import java.io.IOException;
import java.io.InputStream;
@@ -581,7 +581,7 @@
List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
for (String perm : PermissionType.ALL)
{
- AccessControlEntry ace = new AccessControlEntry(SystemIdentity.ANY, perm);
+ AccessControlEntry ace = new AccessControlEntry(IdentityConstants.ANY, perm);
aces.add(ace);
}
AccessControlList acl = new AccessControlList(getACL().getOwner(), aces);
@@ -2591,7 +2591,7 @@
// SystemIdentity.SYSTEM));
return (session.getLockManager().checkLocking(this.nodeData()) || session.getUserID().equals(
- SystemIdentity.SYSTEM));
+ IdentityConstants.SYSTEM));
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -21,7 +21,6 @@
import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.jcr.access.AuthenticationPolicy;
import org.exoplatform.services.jcr.access.DynamicIdentity;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -46,6 +45,7 @@
import org.exoplatform.services.log.Log;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import org.picocontainer.ComponentAdapter;
@@ -88,7 +88,7 @@
/**
* SYSTEM credentials.
*/
- private static final CredentialsImpl SYSTEM_CREDENTIALS = new CredentialsImpl(SystemIdentity.SYSTEM,
+ private static final CredentialsImpl SYSTEM_CREDENTIALS = new CredentialsImpl(IdentityConstants.SYSTEM,
"".toCharArray());
/**
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -22,7 +22,6 @@
import org.exoplatform.services.jcr.access.AccessControlList;
import org.exoplatform.services.jcr.access.AccessControlPolicy;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -44,6 +43,7 @@
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import java.util.ArrayList;
import java.util.List;
@@ -198,7 +198,7 @@
if (rootPermissions != null)
{
- acl.removePermissions(SystemIdentity.ANY);
+ acl.removePermissions(IdentityConstants.ANY);
acl.addPermissions(rootPermissions);
}
@@ -327,15 +327,15 @@
// init version storage
AccessControlList acl = new AccessControlList();
- acl.removePermissions(SystemIdentity.ANY);
- acl.addPermissions(SystemIdentity.ANY, new String[]{PermissionType.READ});
+ acl.removePermissions(IdentityConstants.ANY);
+ acl.addPermissions(IdentityConstants.ANY, new String[]{PermissionType.READ});
for (AccessControlEntry entry : jcrSystem.getACL().getPermissionEntries())
{
String identity = entry.getIdentity();
String permission = entry.getPermission();
- if (!identity.equals(SystemIdentity.ANY) || !permission.equals(PermissionType.READ))
+ if (!identity.equals(IdentityConstants.ANY) || !permission.equals(PermissionType.READ))
{
acl.addPermissions(identity, new String[]{permission});
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/access/JAASAuthenticator.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,11 +18,11 @@
*/
package org.exoplatform.services.jcr.impl.core.access;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.security.ConversationState;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.IdentityRegistry;
import org.exoplatform.services.security.MembershipEntry;
import org.exoplatform.services.security.jaas.BasicCallbackHandler;
@@ -76,9 +76,9 @@
"Credentials for the authentication should be CredentialsImpl or SimpleCredentials type");
// SYSTEM
- if (thisCredentials.getUserID().equals(SystemIdentity.SYSTEM))
+ if (thisCredentials.getUserID().equals(IdentityConstants.SYSTEM))
{
- Identity sid = new Identity(SystemIdentity.SYSTEM, new HashSet<MembershipEntry>());
+ Identity sid = new Identity(IdentityConstants.SYSTEM, new HashSet<MembershipEntry>());
return new ConversationState(sid);
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/QueryResultImpl.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,12 +18,12 @@
import org.exoplatform.services.jcr.access.AccessManager;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.core.SessionDataManager;
import org.exoplatform.services.jcr.impl.core.SessionImpl;
+import org.exoplatform.services.security.IdentityConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +188,7 @@
this.docOrder = orderProps.length == 0 && documentOrder;
this.offset = offset;
this.limit = limit;
- this.isSystemSession = SystemIdentity.SYSTEM.equals(session.getUserID());
+ this.isSystemSession = IdentityConstants.SYSTEM.equals(session.getUserID());
}
/**
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/PermissionValue.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/PermissionValue.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/PermissionValue.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -20,10 +20,10 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.ExtendedPropertyType;
import org.exoplatform.services.jcr.datamodel.ValueData;
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
+import org.exoplatform.services.security.IdentityConstants;
import java.io.IOException;
import java.util.StringTokenizer;
@@ -96,7 +96,7 @@
}
else
{
- persArray[0] = SystemIdentity.ANY;
+ persArray[0] = IdentityConstants.ANY;
}
if (permissionString != null)
{
@@ -121,7 +121,7 @@
static protected String asString(String identity, String permission)
{
if (identity != null || permission != null) // SystemIdentity.ANY, PermissionType.ALL
- return (identity != null ? identity : SystemIdentity.ANY) + AccessControlEntry.DELIMITER
+ return (identity != null ? identity : IdentityConstants.ANY) + AccessControlEntry.DELIMITER
+ (permission != null ? permission : PermissionType.READ);
else
return "";
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -20,7 +20,6 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.AccessControlList;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.dataflow.ItemState;
import org.exoplatform.services.jcr.datamodel.IllegalNameException;
@@ -47,6 +46,7 @@
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import java.io.IOException;
import java.util.ArrayList;
@@ -490,7 +490,7 @@
ItemType.PROPERTY);
AccessControlList acl = new AccessControlList();
- acl.removePermissions(SystemIdentity.ANY);
+ acl.removePermissions(IdentityConstants.ANY);
for (ValueData value : aclData.getValues())
{
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -507,14 +507,11 @@
ImportPropertyData propertyData = null;
if (Constants.JCR_PRIMARYTYPE.equals(propertyInfo.getName()))
{
-
propertyData = endPrimaryType();
-
}
else if (Constants.JCR_MIXINTYPES.equals(propertyInfo.getName()))
{
propertyData = endMixinTypes();
-
}
else if (Constants.JCR_UUID.equals(propertyInfo.getName()))
{
@@ -527,14 +524,12 @@
|| Constants.JCR_BASEVERSION.equals(propertyInfo.getName()) || Constants.JCR_PREDECESSORS
.equals(propertyInfo.getName())))
{
-
propertyData = null;
endVersionable((ImportNodeData)getParent(), parseValues());
}
else
{
-
ImportNodeData currentNodeInfo = (ImportNodeData)getParent();
List<ValueData> values = parseValues();
@@ -553,8 +548,9 @@
return null;
}
else
+ {
throw new RepositoryException("Property definition not found for " + propertyInfo.getName());
-
+ }
}
if (values.size() == 1)
@@ -580,7 +576,6 @@
new ImportPropertyData(QPath.makeChildPath(currentNodeInfo.getQPath(), propertyInfo.getName()),
propertyInfo.getIndentifer(), -1, propertyInfo.getType(), currentNodeInfo.getIdentifier(), isMultivalue);
propertyData.setValues(values);
-
}
return propertyData;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,6 +18,20 @@
*/
package org.exoplatform.services.jcr.api.importing;
+import org.exoplatform.services.jcr.BaseStandaloneTest;
+import org.exoplatform.services.jcr.access.AccessControlEntry;
+import org.exoplatform.services.jcr.access.AccessManager;
+import org.exoplatform.services.jcr.access.PermissionType;
+import org.exoplatform.services.jcr.core.CredentialsImpl;
+import org.exoplatform.services.jcr.core.ExtendedNode;
+import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.jcr.impl.core.SessionImpl;
+import org.exoplatform.services.jcr.util.VersionHistoryImporter;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,22 +58,7 @@
import javax.jcr.query.QueryResult;
import javax.jcr.util.TraversingItemVisitor;
import javax.jcr.version.Version;
-import javax.jcr.version.VersionIterator;
-import org.exoplatform.services.jcr.BaseStandaloneTest;
-import org.exoplatform.services.jcr.access.AccessControlEntry;
-import org.exoplatform.services.jcr.access.AccessManager;
-import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
-import org.exoplatform.services.jcr.core.CredentialsImpl;
-import org.exoplatform.services.jcr.core.ExtendedNode;
-import org.exoplatform.services.jcr.impl.core.NodeImpl;
-import org.exoplatform.services.jcr.impl.core.SessionImpl;
-import org.exoplatform.services.jcr.util.VersionHistoryImporter;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.security.Identity;
-
/**
* Created by The eXo Platform SAS.
*
@@ -105,7 +104,7 @@
testRoot.setPermission(testRoot.getSession().getUserID(), PermissionType.ALL);
testRoot.setPermission("exo", new String[]{PermissionType.SET_PROPERTY});
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
session.save();
assertTrue(accessManager.hasPermission(testRoot.getACL(), PermissionType.SET_PROPERTY, new Identity("exo")));
assertFalse(accessManager.hasPermission(testRoot.getACL(), PermissionType.READ, new Identity("exo")));
@@ -150,7 +149,7 @@
testRoot.setPermission(testRoot.getSession().getUserID(), PermissionType.ALL);
testRoot.setPermission("exo", new String[]{PermissionType.SET_PROPERTY});
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
session.save();
assertTrue(accessManager.hasPermission(testRoot.getACL(), PermissionType.SET_PROPERTY, new Identity("exo")));
assertFalse(accessManager.hasPermission(testRoot.getACL(), PermissionType.READ, new Identity("exo")));
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/reading/TestProperty.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/reading/TestProperty.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/reading/TestProperty.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -21,6 +21,7 @@
import org.exoplatform.services.jcr.JcrAPIBaseTest;
import org.exoplatform.services.jcr.impl.core.PropertyImpl;
import org.exoplatform.services.jcr.impl.core.value.BinaryValue;
+import org.exoplatform.services.jcr.impl.xml.importing.dataflow.PropertyInfo;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -353,4 +354,11 @@
assertFalse(testProperty.equals(new Object()));
}
+
+ public void testPropertyInfoGetValuesSize()
+ {
+ PropertyInfo propertInfo = new PropertyInfo();
+
+ assertEquals(0, propertInfo.getValuesSize());
+ }
}
\ No newline at end of file
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccess.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccess.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccess.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -23,12 +23,12 @@
import org.exoplatform.services.jcr.access.AccessControlList;
import org.exoplatform.services.jcr.access.AccessManager;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.core.ExtendedNode;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.SessionImpl;
import org.exoplatform.services.security.Identity;
+import org.exoplatform.services.security.IdentityConstants;
import java.io.InputStream;
import java.security.AccessControlException;
@@ -39,6 +39,7 @@
import javax.jcr.AccessDeniedException;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -94,7 +95,7 @@
public void testNoAccessControllable() throws Exception
{
AccessControlList acl = ((ExtendedNode)root).getACL();
- assertEquals(SystemIdentity.SYSTEM, acl.getOwner());
+ assertEquals(IdentityConstants.SYSTEM, acl.getOwner());
assertEquals(PermissionType.ALL.length, acl.getPermissionEntries().size());
assertEquals(PermissionType.ALL[0], acl.getPermissionEntries().get(0).getPermission());
}
@@ -106,14 +107,12 @@
*/
public void testOwneable() throws Exception
{
-
ExtendedNode node = (ExtendedNode)session.getRootNode().addNode("testACNode");
node.addMixin("exo:owneable");
AccessControlList acl = node.getACL();
assertEquals(session.getUserID(), acl.getOwner());
assertEquals(PermissionType.ALL.length, acl.getPermissionEntries().size());
assertEquals(PermissionType.ALL[0], acl.getPermissionEntries().get(0).getPermission());
-
}
/**
@@ -123,11 +122,10 @@
*/
public void testPrivilegeable() throws Exception
{
-
ExtendedNode node = (ExtendedNode)session.getRootNode().addNode("testACNode");
node.addMixin("exo:privilegeable");
AccessControlList acl = node.getACL();
- assertEquals(SystemIdentity.SYSTEM, acl.getOwner());
+ assertEquals(IdentityConstants.SYSTEM, acl.getOwner());
assertEquals(PermissionType.ALL.length, acl.getPermissionEntries().size());
assertEquals(PermissionType.ALL[0], acl.getPermissionEntries().get(0).getPermission());
}
@@ -140,7 +138,6 @@
*/
public void testDefaultAccessControllable() throws Exception
{
-
ExtendedNode node = (ExtendedNode)session.getRootNode().addNode("testACNode");
// node.addMixin("exo:accessControllable");
node.addMixin("exo:owneable");
@@ -164,7 +161,6 @@
assertEquals(PermissionType.ALL.length, acl.getPermissionEntries().size());
assertEquals(PermissionType.ALL[0], acl.getPermissionEntries().get(0).getPermission());
-
}
/**
@@ -231,7 +227,6 @@
assertEquals("john", entries.get(0).getIdentity());
assertEquals(PermissionType.ADD_NODE, entries.get(0).getPermission());
assertEquals(PermissionType.READ, entries.get(1).getPermission());
-
}
/**
@@ -307,7 +302,6 @@
catch (AccessControlException e)
{
}
-
}
/**
@@ -366,7 +360,6 @@
catch (AccessDeniedException e)
{
}
-
}
public void testAddNode() throws Exception
@@ -427,7 +420,6 @@
{
session1.refresh(false);
}
-
}
public void testModifyAndReadItem() throws Exception
@@ -570,7 +562,6 @@
assertEquals(credentials.getUserID(), acl.getOwner());
assertEquals(PermissionType.ALL.length, acl.getPermissionEntries().size());
assertEquals(PermissionType.ALL[0], acl.getPermissionEntries().get(0).getPermission());
-
}
public void testPrivilegeableAddNode() throws Exception
@@ -595,7 +586,6 @@
{
fail("PathNotFoundException or AccessDenied should not have been thrown ");
}
-
}
public void testAddSaveAndRead() throws Exception
@@ -610,7 +600,6 @@
NodeImpl node1 = (NodeImpl)session1.getRootNode().getNode("accessTestRoot/testSetAndRemovePermission");
assertEquals(8, node1.getACL().getPermissionEntries().size());
assertEquals(node1.getACL().getOwner(), owner);
-
}
public void testSetAndRemovePermission() throws Exception
@@ -630,7 +619,6 @@
node.removePermission("john");
assertEquals(PermissionType.ALL.length + 1, node.getACL().getPermissionEntries().size());
-
}
/**
@@ -683,7 +671,7 @@
Session session1 = repository.login(new CredentialsImpl("mary", "exo".toCharArray()));
ExtendedNode testRemoveSpecifiedNode =
(ExtendedNode)session1.getRootNode().getNode("accessTestRoot").getNode("testRemoveSpecified");
- testRemoveSpecifiedNode.removePermission(SystemIdentity.ANY);
+ testRemoveSpecifiedNode.removePermission(IdentityConstants.ANY);
assertTrue(accessManager.hasPermission(testRemoveSpecifiedNode.getACL(), PermissionType.READ,
new Identity("john")));
@@ -708,7 +696,6 @@
public void testOperationsByOwner() throws Exception
{
-
Session session1 = repository.login(new CredentialsImpl("john", "exo".toCharArray()));
Node accessTestRoot1 = session1.getRootNode().getNode("accessTestRoot");
@@ -725,13 +712,13 @@
accessTestRoot.setPermission(accessTestRoot.getSession().getUserID(), PermissionType.ALL);
accessTestRoot.removePermission("john");
- accessTestRoot.removePermission(SystemIdentity.ANY);
+ accessTestRoot.removePermission(IdentityConstants.ANY);
accessTestRoot.setPermission("john", new String[]{PermissionType.READ});
ExtendedNode testByOwnerNodeSystem = (ExtendedNode)accessTestRoot.getNode("testByOwnerNode");
testByOwnerNodeSystem.setPermission(accessTestRoot.getSession().getUserID(), PermissionType.ALL);
testByOwnerNodeSystem.removePermission("john");
- testByOwnerNodeSystem.removePermission(SystemIdentity.ANY);
+ testByOwnerNodeSystem.removePermission(IdentityConstants.ANY);
testByOwnerNodeSystem.setPermission("john", new String[]{PermissionType.READ});
session.save();
@@ -767,7 +754,7 @@
testRoot.setPermission("john", new String[]{PermissionType.READ, PermissionType.ADD_NODE,
PermissionType.SET_PROPERTY});
testRoot.setPermission(accessTestRoot.getSession().getUserID(), PermissionType.ALL);
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
ExtendedNode subRoot = (ExtendedNode)testRoot.addNode("subroot");
accessTestRoot.getSession().save();
@@ -807,7 +794,7 @@
testNode.addMixin("exo:privilegeable");
session.save();
- Session anonimSession = repository.login(new CredentialsImpl(SystemIdentity.ANONIM, "".toCharArray()));
+ Session anonimSession = repository.login(new CredentialsImpl(IdentityConstants.ANONIM, "".toCharArray()));
// try {
// anonimSession.checkPermission(testNode.getPath(), PermissionType.READ);
// anonimSession.getRootNode().getNode("."+testNode.getPath());
@@ -818,7 +805,7 @@
// }
testNode.setPermission(testNode.getSession().getUserID(), PermissionType.ALL);
- testNode.removePermission(SystemIdentity.ANY);
+ testNode.removePermission(IdentityConstants.ANY);
session.save();
try
{
@@ -830,7 +817,7 @@
}
- testNode.setPermission(SystemIdentity.ANY, new String[]{PermissionType.READ});
+ testNode.setPermission(IdentityConstants.ANY, new String[]{PermissionType.READ});
session.save();
try
@@ -844,7 +831,7 @@
{
}
- testNode.removePermission(SystemIdentity.ANY);
+ testNode.removePermission(IdentityConstants.ANY);
session.save();
try
{
@@ -855,7 +842,7 @@
{
}
- testNode.setPermission(SystemIdentity.ANY, new String[]{PermissionType.READ, PermissionType.SET_PROPERTY,
+ testNode.setPermission(IdentityConstants.ANY, new String[]{PermissionType.READ, PermissionType.SET_PROPERTY,
PermissionType.REMOVE});
session.save();
@@ -891,7 +878,6 @@
{
}
-
}
public void testDualCheckPermissions() throws Exception
@@ -902,7 +888,7 @@
testRoot.setPermission("john", new String[]{PermissionType.READ, PermissionType.ADD_NODE,
PermissionType.SET_PROPERTY});
testRoot.setPermission(accessTestRoot.getSession().getUserID(), PermissionType.ALL);
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
accessTestRoot.save();
AccessManager accessManager = ((SessionImpl)accessTestRoot.getSession()).getAccessManager();
@@ -920,7 +906,6 @@
assertFalse(accessManager.hasPermission(testRoot.getACL(), new String[]{PermissionType.READ,
PermissionType.REMOVE}, session1.getUserState().getIdentity()));
-
}
/**
@@ -934,7 +919,7 @@
testRoot.addMixin("exo:privilegeable");
session.save();
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
try
{
@@ -962,7 +947,7 @@
testRoot2.addMixin("exo:privilegeable");
session.save();
- testRoot2.setPermission(SystemIdentity.ANY, new String[]{});
+ testRoot2.setPermission(IdentityConstants.ANY, new String[]{});
try
{
session.save();
@@ -985,7 +970,7 @@
testRoot.addMixin("exo:privilegeable");
session.save();
- testRoot.setPermission(SystemIdentity.ANY, PermissionType.ALL);
+ testRoot.setPermission(IdentityConstants.ANY, PermissionType.ALL);
session.save();
session.checkPermission(testRoot.getPath(), PermissionType.ADD_NODE);
@@ -1049,7 +1034,6 @@
Node testNodeAdmin = session.getRootNode().getNode("testNode");
testNodeAdmin.remove();
-
}
/**
@@ -1088,6 +1072,16 @@
session1.save();
}
+ public void testAccessControlEntryEquals() throws PathNotFoundException, RepositoryException
+ {
+ root.addNode("testNode");
+ ExtendedNode testNode = (ExtendedNode)session.getItem("/testNode");
+ AccessControlEntry perm = testNode.getACL().getPermissionEntries().get(0);
+
+ assertTrue(perm.equals(perm));
+ assertFalse(perm.equals(new Object()));
+ }
+
private void showPermissions(String path) throws RepositoryException
{
NodeImpl node = (NodeImpl)this.repository.getSystemSession().getRootNode().getNode(path);
@@ -1096,7 +1090,5 @@
{
log.debug("DUMP: " + acl.dump());
}
-
}
-
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessChildNodes.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessChildNodes.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessChildNodes.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,9 +18,9 @@
import org.exoplatform.services.jcr.BaseStandaloneTest;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.security.IdentityConstants;
import javax.jcr.AccessDeniedException;
import javax.jcr.Node;
@@ -83,7 +83,7 @@
subNode.setPermission("mary", PermissionType.ALL);
subNode.removePermission("john");
- subNode.removePermission(SystemIdentity.ANY);
+ subNode.removePermission(IdentityConstants.ANY);
sessMary.save();
sessMary.logout();
@@ -123,7 +123,7 @@
sessMary = repository.login(new CredentialsImpl("mary", "exo".toCharArray()));
testRoot = sessMary.getRootNode().getNode("testRoot");
subNode = (NodeImpl)testRoot.getNode("subNode");
- subNode.setPermission(SystemIdentity.ANY, PermissionType.ALL);
+ subNode.setPermission(IdentityConstants.ANY, PermissionType.ALL);
sessMary.save();
sessMary.logout();
@@ -151,13 +151,13 @@
//set permissions
subNode.setPermission("mary", PermissionType.ALL);
subNode.removePermission("john");
- subNode.removePermission(SystemIdentity.ANY);
+ subNode.removePermission(IdentityConstants.ANY);
sessMary.save();
testRoot.setPermission("john", PermissionType.ALL);
testRoot.removePermission("mary");
testRoot.setPermission("mary", new String[]{PermissionType.READ});
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
sessMary.save();
sessMary.logout();
@@ -196,7 +196,7 @@
testRoot.removePermission("mary");
testRoot.setPermission("mary", new String[]{PermissionType.READ});
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
sessMary.save();
sessMary.logout();
@@ -231,7 +231,7 @@
testRoot.removePermission("mary");
testRoot.setPermission("mary", PermissionType.ALL);
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
sessMary.save();
sessMary.logout();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessUpdateMixin.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessUpdateMixin.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestAccessUpdateMixin.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,9 +18,9 @@
import org.exoplatform.services.jcr.BaseStandaloneTest;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.security.IdentityConstants;
import javax.jcr.AccessDeniedException;
import javax.jcr.Node;
@@ -79,10 +79,10 @@
testRoot.setPermission("mary", PermissionType.ALL);
testRoot.setPermission("john", PermissionType.ALL);
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
subNode.setPermission("mary", new String[]{PermissionType.READ, PermissionType.SET_PROPERTY});
- subNode.removePermission(SystemIdentity.ANY);
+ subNode.removePermission(IdentityConstants.ANY);
sessJohn.save();
sessJohn.logout();
@@ -118,10 +118,10 @@
testRoot.setPermission("mary", new String[]{PermissionType.READ});
testRoot.setPermission("john", PermissionType.ALL);
- testRoot.removePermission(SystemIdentity.ANY);
+ testRoot.removePermission(IdentityConstants.ANY);
subNode.setPermission("mary", PermissionType.ALL);
- subNode.removePermission(SystemIdentity.ANY);
+ subNode.removePermission(IdentityConstants.ANY);
sessJohn.save();
sessJohn.logout();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestPermissions.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestPermissions.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestPermissions.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -20,13 +20,13 @@
import org.exoplatform.services.jcr.BaseStandaloneTest;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.SessionImpl;
import org.exoplatform.services.jcr.impl.core.version.VersionHistoryImpl;
import org.exoplatform.services.jcr.impl.core.version.VersionImpl;
+import org.exoplatform.services.security.IdentityConstants;
import java.util.ArrayList;
import java.util.List;
@@ -97,7 +97,7 @@
node.addMixin("exo:owneable");
node.setPermission("mary", new String[]{PermissionType.READ});
node.setPermission("admin", PermissionType.ALL);
- node.removePermission(SystemIdentity.ANY);
+ node.removePermission(IdentityConstants.ANY);
node.addNode("test");
sessionWS1.save();
@@ -312,18 +312,18 @@
node.getSession().save();
node.setPermission("admin", new String[]{"read", "add_node", "set_property", "remove"});
- node.removePermission(SystemIdentity.ANY);
+ node.removePermission(IdentityConstants.ANY);
NodeImpl subNode = (NodeImpl)node.addNode("subNode");
node.getSession().save();
node.checkin();
- node.setPermission(SystemIdentity.ANY, new String[]{"read"});
+ node.setPermission(IdentityConstants.ANY, new String[]{"read"});
node.getSession().save();
Credentials credentials = new CredentialsImpl("john", "exo".toCharArray());
SessionImpl sessionJohnWS1 = (SessionImpl)repositoryService.getRepository("db2").login(credentials, "ws1");
- Credentials anonCredentials = new CredentialsImpl(SystemIdentity.ANONIM, "".toCharArray());
+ Credentials anonCredentials = new CredentialsImpl(IdentityConstants.ANONIM, "".toCharArray());
SessionImpl anonSession = (SessionImpl)repositoryService.getRepository("db2").login(anonCredentials, "ws1");
try
{
@@ -380,7 +380,7 @@
node.clearACL();
node.setPermission("admin", new String[]{"read", "add_node", "set_property", "remove"});
- node.setPermission(SystemIdentity.ANY, new String[]{"read"});
+ node.setPermission(IdentityConstants.ANY, new String[]{"read"});
NodeImpl subNode = (NodeImpl)node.addNode("subNode");
node.getSession().save();
@@ -390,7 +390,7 @@
Credentials credentials = new CredentialsImpl("john", "exo".toCharArray());
SessionImpl sessionJohnWS1 = (SessionImpl)repositoryService.getRepository("db2").login(credentials, "ws1");
- Credentials anonCredentials = new CredentialsImpl(SystemIdentity.ANONIM, "".toCharArray());
+ Credentials anonCredentials = new CredentialsImpl(IdentityConstants.ANONIM, "".toCharArray());
SessionImpl anonSession = (SessionImpl)repositoryService.getRepository("db2").login(anonCredentials, "ws1");
try
{
@@ -454,7 +454,7 @@
sessionWS1.save();
assertEquals(node.getACL().getPermissions("mary").size(), 0);
- assertEquals(node.getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(node.getACL().getOwner(), IdentityConstants.SYSTEM);
// destination node has its own permissions and owner
node = (NodeImpl)sessionWS1.getRootNode().addNode("dstNode");
@@ -496,7 +496,7 @@
sessionWS1.save();
assertEquals(node.getACL().getPermissions("admin").size(), 4);
- assertEquals(node.getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(node.getACL().getOwner(), IdentityConstants.SYSTEM);
// move node to new destination with new ACL
sessionWS1.move("/srcNode", "/dstNode/newSrc");
@@ -517,7 +517,7 @@
sessionWS1.save();
assertEquals(node.getACL().getPermissions("mary").size(), 0);
- assertEquals(node.getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(node.getACL().getOwner(), IdentityConstants.SYSTEM);
// destination node has its own permissions and owner
node = (NodeImpl)sessionWS1.getRootNode().addNode("dstNode");
@@ -558,7 +558,7 @@
sessionWS1.save();
assertEquals(node.getACL().getPermissions("admin").size(), 4);
- assertEquals(node.getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(node.getACL().getOwner(), IdentityConstants.SYSTEM);
// move node to new destination with new ACL
sessionWS1.getWorkspace().copy("/srcNode", "/dstNode/newSrc");
@@ -587,7 +587,7 @@
Credentials johnCredentials = new CredentialsImpl("john", "exo".toCharArray());
SessionImpl johnSession = (SessionImpl)repositoryService.getRepository("db2").login(johnCredentials, "ws1");
- Credentials anonCredentials = new CredentialsImpl(SystemIdentity.ANONIM, "".toCharArray());
+ Credentials anonCredentials = new CredentialsImpl(IdentityConstants.ANONIM, "".toCharArray());
SessionImpl anonSession = (SessionImpl)repositoryService.getRepository("db2").login(anonCredentials, "ws1");
NodeImpl node = (NodeImpl)sessionWS1.getRootNode().addNode(TESTNODE_NAME);
@@ -597,7 +597,7 @@
node.setPermission("*:/platform/administrators", PermissionType.ALL);
node.setPermission("mary",
new String[]{PermissionType.READ, PermissionType.SET_PROPERTY, PermissionType.ADD_NODE});
- node.removePermission(SystemIdentity.ANY);
+ node.removePermission(IdentityConstants.ANY);
sessionWS1.save();
// child node exo:privilegeable & exo:owneable
@@ -606,7 +606,7 @@
childNode1.addMixin("exo:owneable");
childNode1.setPermission("*:/platform/administrators", PermissionType.ALL);
childNode1.setPermission("mary", new String[]{PermissionType.READ, PermissionType.SET_PROPERTY});
- childNode1.removePermission(SystemIdentity.ANY);
+ childNode1.removePermission(IdentityConstants.ANY);
sessionWS1.save();
// child node all inherited from parent
@@ -626,7 +626,7 @@
childNode4.addMixin("exo:privilegeable");
childNode4.setPermission("*:/platform/administrators", PermissionType.ALL);
childNode4.setPermission("mary", new String[]{PermissionType.READ, PermissionType.SET_PROPERTY});
- childNode4.removePermission(SystemIdentity.ANY);
+ childNode4.removePermission(IdentityConstants.ANY);
sessionWS1.save();
// check what we have
@@ -788,7 +788,7 @@
node.setPermission("*:/platform/administrators", PermissionType.ALL);
node.setPermission("mary",
new String[]{PermissionType.READ, PermissionType.SET_PROPERTY, PermissionType.ADD_NODE});
- node.removePermission(SystemIdentity.ANY);
+ node.removePermission(IdentityConstants.ANY);
sessionWS1.save();
// check what we have
@@ -797,7 +797,7 @@
assertTrue(marysNode.hasPermission(PermissionType.SET_PROPERTY));
assertTrue(marysNode.hasPermission(PermissionType.ADD_NODE));
assertFalse(marysNode.hasPermission(PermissionType.REMOVE));
- assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), IdentityConstants.SYSTEM);
// v1
node.checkin();
@@ -819,7 +819,7 @@
assertTrue(marysNode.hasPermission(PermissionType.SET_PROPERTY));
assertTrue(marysNode.hasPermission(PermissionType.ADD_NODE));
assertFalse(marysNode.hasPermission(PermissionType.REMOVE));
- assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), SystemIdentity.SYSTEM);
+ assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), IdentityConstants.SYSTEM);
}
/**
@@ -837,7 +837,7 @@
// check what we have
NodeImpl marysNode = (NodeImpl)sessionMaryWS1.getRootNode().getNode(TESTNODE_NAME);
assertEquals(marysNode.getACL().getPermissionsSize(), 4);
- assertEquals(marysNode.getACL().getPermissions(SystemIdentity.ANY).size(), 4);
+ assertEquals(marysNode.getACL().getPermissions(IdentityConstants.ANY).size(), 4);
assertEquals(marysNode.getACL().getPermissions("mary").size(), 0);
assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), "admin");
@@ -858,7 +858,7 @@
// check what we have after restore
marysNode = (NodeImpl)sessionMaryWS1.getRootNode().getNode(TESTNODE_NAME);
assertEquals(marysNode.getACL().getPermissionsSize(), 4);
- assertEquals(marysNode.getACL().getPermissions(SystemIdentity.ANY).size(), 4);
+ assertEquals(marysNode.getACL().getPermissions(IdentityConstants.ANY).size(), 4);
assertEquals(marysNode.getACL().getPermissions("mary").size(), 0);
assertEquals(((NodeData)marysNode.getData()).getACL().getOwner(), "admin");
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestUserAccess.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestUserAccess.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/access/TestUserAccess.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -20,9 +20,9 @@
import org.exoplatform.services.jcr.JcrImplBaseTest;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import java.security.AccessControlException;
@@ -83,7 +83,7 @@
maryNode.setPermission("mary", PermissionType.ALL);
maryNode.removePermission(session.getUserID());
}
- maryNode.removePermission(SystemIdentity.ANY);
+ maryNode.removePermission(IdentityConstants.ANY);
testRoot.save();
try
@@ -119,7 +119,7 @@
rootNode.setPermission("root", PermissionType.ALL);
rootNode.removePermission(session.getUserID());
}
- rootNode.removePermission(SystemIdentity.ANY);
+ rootNode.removePermission(IdentityConstants.ANY);
testRoot.save();
try
@@ -155,8 +155,8 @@
// set any to read only
rootNode.setPermission(session.getUserID(), PermissionType.ALL); // temp all for current user
- rootNode.removePermission(SystemIdentity.ANY);
- rootNode.setPermission(SystemIdentity.ANY, new String[]{PermissionType.READ});
+ rootNode.removePermission(IdentityConstants.ANY);
+ rootNode.setPermission(IdentityConstants.ANY, new String[]{PermissionType.READ});
rootNode.removePermission(session.getUserID()); // clean temp rights
testRoot.save();
@@ -195,7 +195,7 @@
maryNode.setPermission("mary", PermissionType.ALL);
maryNode.removePermission(session.getUserID());
}
- maryNode.removePermission(SystemIdentity.ANY);
+ maryNode.removePermission(IdentityConstants.ANY);
testRoot.save();
Session marySession =
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -21,12 +21,12 @@
import org.exoplatform.services.jcr.JcrImplBaseTest;
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.access.AccessControlList;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ExtendedNode;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import java.util.ArrayList;
@@ -136,7 +136,7 @@
{
if (wsEntry.getAutoInitPermissions() != null)
{
- expectedAcl.removePermissions(SystemIdentity.ANY);
+ expectedAcl.removePermissions(IdentityConstants.ANY);
expectedAcl.addPermissions(wsEntry.getAutoInitPermissions());
}
AccessControlList acl = ((ExtendedNode)session.getRootNode()).getACL();
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/TestExternalizabeItemData.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/TestExternalizabeItemData.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/TestExternalizabeItemData.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -76,5 +76,4 @@
assertNotNull(idDest);
}
-
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -21,7 +21,6 @@
import org.exoplatform.services.jcr.JcrImplBaseTest;
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.dataflow.DataManager;
import org.exoplatform.services.jcr.dataflow.ItemState;
import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl;
@@ -38,6 +37,7 @@
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
+import org.exoplatform.services.security.IdentityConstants;
import java.util.ArrayList;
import java.util.List;
@@ -177,7 +177,7 @@
new TransientValueData(Constants.EXO_PRIVILEGEABLE));
List<ValueData> vd = new ArrayList<ValueData>();
- vd.add(new TransientValueData(SystemIdentity.ANY + AccessControlEntry.DELIMITER + PermissionType.READ));
+ vd.add(new TransientValueData(IdentityConstants.ANY + AccessControlEntry.DELIMITER + PermissionType.READ));
vd.add(new TransientValueData("managers" + AccessControlEntry.DELIMITER + PermissionType.SET_PROPERTY));
@@ -198,9 +198,9 @@
(NodeData)dataManager.getItemData(root, new QPathEntry(InternalQName.parse("[]jdbcStorageConnectionTest"), 1),
ItemType.NODE);
- List<String> iperms = troot.getACL().getPermissions(SystemIdentity.ANY);
- assertEquals("Wrong permission for " + SystemIdentity.ANY, 1, iperms.size());
- assertEquals("Wrong permission for " + SystemIdentity.ANY, PermissionType.READ, iperms.get(0));
+ List<String> iperms = troot.getACL().getPermissions(IdentityConstants.ANY);
+ assertEquals("Wrong permission for " + IdentityConstants.ANY, 1, iperms.size());
+ assertEquals("Wrong permission for " + IdentityConstants.ANY, PermissionType.READ, iperms.get(0));
iperms = troot.getACL().getPermissions("managers");
assertEquals("Wrong permission for managers", 1, iperms.size());
@@ -223,7 +223,7 @@
TransientPropertyData.createPropertyData(testRoot, Constants.JCR_MIXINTYPES, PropertyType.NAME, true, mixvd);
List<ValueData> vd = new ArrayList<ValueData>();
- vd.add(new TransientValueData(SystemIdentity.ANY + AccessControlEntry.DELIMITER + PermissionType.READ));
+ vd.add(new TransientValueData(IdentityConstants.ANY + AccessControlEntry.DELIMITER + PermissionType.READ));
vd.add(new TransientValueData("managers" + AccessControlEntry.DELIMITER + PermissionType.SET_PROPERTY));
@@ -251,9 +251,9 @@
assertEquals("Owner is not valid", "exo", troot.getACL().getOwner());
- List<String> iperms = troot.getACL().getPermissions(SystemIdentity.ANY);
- assertEquals("Wrong permission for " + SystemIdentity.ANY, 1, iperms.size());
- assertEquals("Wrong permission for " + SystemIdentity.ANY, PermissionType.READ, iperms.get(0));
+ List<String> iperms = troot.getACL().getPermissions(IdentityConstants.ANY);
+ assertEquals("Wrong permission for " + IdentityConstants.ANY, 1, iperms.size());
+ assertEquals("Wrong permission for " + IdentityConstants.ANY, PermissionType.READ, iperms.get(0));
iperms = troot.getACL().getPermissions("managers");
assertEquals("Wrong permission for managers", 1, iperms.size());
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2012-01-18 08:01:32 UTC (rev 5477)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/common/DynamicSessionProviderTest.java 2012-01-18 09:04:15 UTC (rev 5478)
@@ -18,12 +18,12 @@
import org.exoplatform.services.jcr.access.AccessControlEntry;
import org.exoplatform.services.jcr.access.PermissionType;
-import org.exoplatform.services.jcr.access.SystemIdentity;
import org.exoplatform.services.jcr.core.CredentialsImpl;
import org.exoplatform.services.jcr.ext.BaseStandaloneTest;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.security.IdentityConstants;
import java.util.ArrayList;
import java.util.List;
@@ -66,7 +66,7 @@
maryNode.setPermission("mary", PermissionType.ALL);
maryNode.removePermission(session.getUserID());
}
- maryNode.removePermission(SystemIdentity.ANY);
+ maryNode.removePermission(IdentityConstants.ANY);
testRoot.save();
Session marySession =
More information about the exo-jcr-commits
mailing list