portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r929535 [2/2] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/impl/ components/jetspeed-...
Date Wed, 31 Mar 2010 13:38:35 GMT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultJetspeedSecuritySynchronizer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultJetspeedSecuritySynchronizer.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultJetspeedSecuritySynchronizer.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/DefaultJetspeedSecuritySynchronizer.java
Wed Mar 31 13:38:34 2010
@@ -67,7 +67,7 @@ public class DefaultJetspeedSecuritySync
         createRelations();
     }
 
-    public synchronized void synchronizeAll()
+    public synchronized void synchronizeAll() throws SecurityException
     {
         setSynchronizing(true);
         try
@@ -92,7 +92,7 @@ public class DefaultJetspeedSecuritySync
         }
     }
 
-    public synchronized void synchronizePrincipalsByType(String type, boolean recursive)
+    public synchronized void synchronizePrincipalsByType(String type, boolean recursive)
throws SecurityException
     {
         setSynchronizing(true);
         try
@@ -116,7 +116,7 @@ public class DefaultJetspeedSecuritySync
         }
     }
 
-    public synchronized void synchronizeUserPrincipal(String name, boolean recursive)
+    public synchronized void synchronizeUserPrincipal(String name, boolean recursive) throws
SecurityException
     {
         setSynchronizing(true);
         try
@@ -133,7 +133,7 @@ public class DefaultJetspeedSecuritySync
         }
     }
 
-    protected JetspeedPrincipal recursiveSynchronizeEntity(Entity entity, InternalSynchronizationState
syncState, boolean recursive)
+    protected JetspeedPrincipal recursiveSynchronizeEntity(Entity entity, InternalSynchronizationState
syncState, boolean recursive) throws SecurityException
     {
         JetspeedPrincipal updatedPrincipal = null;
         if (entity != null && !syncState.isProcessed(entity))
@@ -151,7 +151,8 @@ public class DefaultJetspeedSecuritySync
         return updatedPrincipal;
     }
 
-    protected JetspeedPrincipal synchronizeEntityRelations(JetspeedPrincipal principal, Entity
entity, InternalSynchronizationState syncState, boolean recursive)
+    protected JetspeedPrincipal synchronizeEntityRelations(JetspeedPrincipal principal, Entity
entity, InternalSynchronizationState syncState, boolean recursive) 
+       throws SecurityException
     {
         if (entityToRelationTypes.values().size() != 0)
             // loop through all relation types for this entity type
@@ -196,6 +197,7 @@ public class DefaultJetspeedSecuritySync
      */
     protected Collection<Long> synchronizeAddedEntityRelations(SecurityEntityRelationType
relationTypeForThisEntity, Entity entity, JetspeedPrincipal principal,
                                                               boolean entityIsFromEntity,
InternalSynchronizationState syncState, boolean recursive)
+                                                              throws SecurityException
     {
         Collection<Entity> relatedEntities = entityIsFromEntity ? securityEntityManager.getRelatedEntitiesFrom(entity,
relationTypeForThisEntity)
                                                                : securityEntityManager.getRelatedEntitiesTo(entity,
relationTypeForThisEntity);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLdapAssociationStorageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLdapAssociationStorageManager.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLdapAssociationStorageManager.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/JetspeedPrincipalLdapAssociationStorageManager.java
Wed Mar 31 13:38:34 2010
@@ -18,10 +18,7 @@ package org.apache.jetspeed.security.spi
 
 import org.apache.jetspeed.security.JetspeedPrincipal;
 import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.mapping.EntityFactory;
 import org.apache.jetspeed.security.mapping.SecurityEntityManager;
-import org.apache.jetspeed.security.mapping.impl.SecurityEntityRelationTypeImpl;
-import org.apache.jetspeed.security.mapping.model.Entity;
 import org.apache.jetspeed.security.mapping.model.SecurityEntityRelationType;
 import org.apache.jetspeed.security.spi.JetspeedPrincipalAssociationStorageManager;
 
@@ -48,12 +45,11 @@ public class JetspeedPrincipalLdapAssoci
     {
         if (!SynchronizationStateAccess.isSynchronizing())
         {
-            EntityFactory entityFactory = ldapEntityManager.getEntityFactory(from.getType().getName());
-            EntityFactory relatedFactory = ldapEntityManager.getEntityFactory(to.getType().getName());
-            Entity fromEntity = entityFactory.createEntity(from);
-            Entity toEntity = relatedFactory.createEntity(to);
-            SecurityEntityRelationType relationType = new SecurityEntityRelationTypeImpl(associationName,
fromEntity.getType(), toEntity.getType());
-            ldapEntityManager.addRelation(fromEntity, toEntity, relationType);
+            SecurityEntityRelationType relationType = ldapEntityManager.getSupportedEntityRelationType(associationName,
from.getType().getName(), to.getType().getName());
+            if (relationType != null)
+            {
+                ldapEntityManager.addRelation(from.getName(), to.getName(), relationType);
+            }
         }
         databaseStorageManager.addAssociation(from, to, associationName);
     }
@@ -62,12 +58,11 @@ public class JetspeedPrincipalLdapAssoci
     {
         if (!SynchronizationStateAccess.isSynchronizing())
         {
-            EntityFactory entityFactory = ldapEntityManager.getEntityFactory(from.getType().getName());
-            EntityFactory relatedFactory = ldapEntityManager.getEntityFactory(to.getType().getName());
-            Entity fromEntity = entityFactory.createEntity(from);
-            Entity toEntity = relatedFactory.createEntity(to);
-            SecurityEntityRelationType relationType = new SecurityEntityRelationTypeImpl(associationName,
fromEntity.getType(), toEntity.getType());
-            ldapEntityManager.removeRelation(fromEntity, toEntity, relationType);
+            SecurityEntityRelationType relationType = ldapEntityManager.getSupportedEntityRelationType(associationName,
from.getType().getName(), to.getType().getName());
+            if (relationType != null)
+            {
+                ldapEntityManager.removeRelation(from.getName(), to.getName(), relationType);
+            }
         }
         databaseStorageManager.removeAssociation(from, to, associationName);
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/AbstractSetup1LDAPTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/AbstractSetup1LDAPTest.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/AbstractSetup1LDAPTest.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/AbstractSetup1LDAPTest.java
Wed Mar 31 13:38:34 2010
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.security.mapping.ldap.setup1;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -104,15 +103,11 @@ public abstract class AbstractSetup1LDAP
         roleDAO = new SpringLDAPEntityDAO(roleSearchConfig);
         roleDAO.setLdapTemplate(ldapTemplate);
 
-        Map<String, EntityDAO> daos = new HashMap<String, EntityDAO>();
-        daos.put("user", userDAO);
-        daos.put("role", roleDAO);
-
-        entityManager = new DefaultLDAPEntityManager();
-        entityManager.setEntityDAOs(daos);
-
+        ArrayList<EntityDAO> daos = new ArrayList<EntityDAO>();
+        daos.add(userDAO);
+        daos.add(roleDAO);
         // relation DAOs
-        Collection<EntityRelationDAO> relationDaos = new ArrayList<EntityRelationDAO>();
+        ArrayList<EntityRelationDAO> relationDaos = new ArrayList<EntityRelationDAO>();
 
         // hasRole relation DAO
         hasRoleDAO = new AttributeBasedRelationDAO();
@@ -124,8 +119,7 @@ public abstract class AbstractSetup1LDAP
         hasRoleDAO.setAttributeContainsInternalId(true);
         relationDaos.add(hasRoleDAO);
 
-        entityManager.setEntityRelationDAOs(relationDaos);
-
+        entityManager = new DefaultLDAPEntityManager(daos, relationDaos);
     }
 
     @Override

Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java
(from r929034, portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP.java&r1=929034&r2=929535&rev=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java
Wed Mar 31 13:38:34 2010
@@ -30,11 +30,11 @@ import org.apache.jetspeed.security.mapp
  * @author <a href="mailto:ddam@apache.org">Dennis Dam</a>
  * @version $Id$
  */
-public class TestLDAP extends AbstractSetup1LDAPTest
+public class TestLDAP1 extends AbstractSetup1LDAPTest
 {
     public static Test suite()
     {
-        return createFixturedTestSuite(TestLDAP.class, "ldapTestSetup", "ldapTestTeardown");
+        return createFixturedTestSuite(TestLDAP1.class, "ldapTestSetup", "ldapTestTeardown");
     }
     
     public void testSingleUser() throws Exception
@@ -200,21 +200,6 @@ public class TestLDAP extends AbstractSe
         basicTestCases.testFetchSingleEntity(entityManager, jsmithCopy);
     }
     
-    public void testUpdateInternalAttrs() throws Exception {
-        EntityImpl jsmith = getDefaultJoeSmith();
-        jsmith.setAttribute(SN_DEF.getName(), "whatever");
-        jsmith.setAttribute(GIVEN_NAME_DEF.getName(), "foobar");
-        
-        // note: we call the user DAO directly, because updating internal
-        // attributes is only meant to be used internally, e.g. from within an EntityRelationDAO
-        userDAO.updateInternalAttributes(jsmith);
-
-        // reset given name to value in ldap, givenName should be unmodified
-        // the (internal) sn attribute is modified in LDAP
-        jsmith.setAttribute(GIVEN_NAME_DEF.getName(), "Joe Smith");
-        basicTestCases.testFetchSingleEntity(entityManager, jsmith);
-    }
-    
     @Override
     protected void internaltearDown() throws Exception
     {

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup1/TestLDAP1.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/AbstractSetup2LDAPTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/AbstractSetup2LDAPTest.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/AbstractSetup2LDAPTest.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/AbstractSetup2LDAPTest.java
Wed Mar 31 13:38:34 2010
@@ -17,7 +17,6 @@
 package org.apache.jetspeed.security.mapping.ldap.setup2;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -122,21 +121,12 @@ public abstract class AbstractSetup2LDAP
         SpringLDAPEntityDAO groupDAO = new SpringLDAPEntityDAO(groupSearchConfig);
         groupDAO.setLdapTemplate(ldapTemplate);
 
-        Map<String, EntityDAO> daos = new HashMap<String, EntityDAO>();
-        daos.put("user", userDAO);
-        daos.put("role", roleDAO);
-
-        entityManager = new DefaultLDAPEntityManager();
-        entityManager.setEntityDAOs(daos);
-        daos.put("user", userDAO);
-        daos.put("role", roleDAO);
-        daos.put("group", groupDAO);
-
-        entityManager = new DefaultLDAPEntityManager();
-        entityManager.setEntityDAOs(daos);
-
-        // relation DAOs
-        Collection<EntityRelationDAO> relationDaos = new ArrayList<EntityRelationDAO>();
+        ArrayList<EntityDAO> daos = new ArrayList<EntityDAO>();
+        daos.add(userDAO);
+        daos.add(roleDAO);
+        daos.add(groupDAO);
+        
+        ArrayList<EntityRelationDAO> relationDaos = new ArrayList<EntityRelationDAO>();
 
         // hasRole relation DAO
         // use attribute on from entity (of "user" type); user IDs are stored
@@ -148,8 +138,7 @@ public abstract class AbstractSetup2LDAP
         hasRoleDAO.setAttributeContainsInternalId(true);
         relationDaos.add(hasRoleDAO);
 
-        entityManager.setEntityRelationDAOs(relationDaos);
-
+        entityManager = new DefaultLDAPEntityManager(daos, relationDaos);
     }
 
     @Override

Copied: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java
(from r929033, portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java?p2=portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP.java&r1=929033&r2=929535&rev=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java
Wed Mar 31 13:38:34 2010
@@ -28,11 +28,11 @@ import org.apache.jetspeed.security.mapp
  * @author <a href="mailto:ddam@apache.org">Dennis Dam</a>
  * @version $Id$
  */
-public class TestLDAP extends AbstractSetup2LDAPTest
+public class TestLDAP2 extends AbstractSetup2LDAPTest
 {
     public static Test suite()
     {
-        return createFixturedTestSuite(TestLDAP.class, "ldapTestSetup", "ldapTestTeardown");
+        return createFixturedTestSuite(TestLDAP2.class, "ldapTestSetup", "ldapTestTeardown");
     }
 
     public void testSingleUser() throws Exception

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/ldap/setup2/TestLDAP2.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityDAO.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityDAO.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityDAO.java
Wed Mar 31 13:38:34 2010
@@ -20,6 +20,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.mapping.EntityFactory;
 import org.apache.jetspeed.security.mapping.ldap.dao.EntityDAO;
 import org.apache.jetspeed.security.mapping.model.Entity;
@@ -145,4 +146,10 @@ public class StubEntityDAO implements En
         // TODO Auto-generated method stub
         
     }
+
+    public String getInternalId(String entityId, boolean required) throws SecurityException
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityRelationDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityRelationDAO.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityRelationDAO.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/mapping/stubs/StubEntityRelationDAO.java
Wed Mar 31 13:38:34 2010
@@ -21,6 +21,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.mapping.ldap.dao.EntityDAO;
 import org.apache.jetspeed.security.mapping.ldap.dao.EntityRelationDAO;
 import org.apache.jetspeed.security.mapping.model.Entity;
@@ -96,4 +97,15 @@ public class StubEntityRelationDAO imple
         
     }
 
+    public void addRelation(EntityDAO sourceDao, EntityDAO targetDao, String sourceEntityId,
String targetEntityId) throws SecurityException
+    {
+        // TODO Auto-generated method stub
+        
+    }
+
+    public void removeRelation(EntityDAO sourceDao, EntityDAO targetDao, String sourceEntityId,
String targetEntityId) throws SecurityException
+    {
+        // TODO Auto-generated method stub
+        
+    }
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestDefaultJetspeedSynchronizer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestDefaultJetspeedSynchronizer.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestDefaultJetspeedSynchronizer.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestDefaultJetspeedSynchronizer.java
Wed Mar 31 13:38:34 2010
@@ -18,8 +18,6 @@ package org.apache.jetspeed.security.spi
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -111,22 +109,17 @@ public class TestDefaultJetspeedSynchron
         groupToRole.relate(null, null, group_board, role_manager);
         groupToRole.relate(null, null, group_programmers, role_yetAnother);
         
-        Map<String,EntityDAO> entityDAOs = new HashMap<String,EntityDAO>();
-        entityDAOs.put(JetspeedPrincipalType.USER,userDao);
-        entityDAOs.put(JetspeedPrincipalType.ROLE,roleDao);
-        entityDAOs.put(JetspeedPrincipalType.USER,groupDao);
+        ArrayList<EntityDAO> entityDAOs = new ArrayList<EntityDAO>();
+        entityDAOs.add(userDao);
+        entityDAOs.add(roleDao);
+        entityDAOs.add(groupDao);
 
-        Collection<EntityRelationDAO> entityRelationDAOs = new ArrayList<EntityRelationDAO>();
+        ArrayList<EntityRelationDAO> entityRelationDAOs = new ArrayList<EntityRelationDAO>();
         entityRelationDAOs.add(userToRole);
         entityRelationDAOs.add(userToGroup);
         entityRelationDAOs.add(groupToRole);
 
-        DefaultLDAPEntityManager entityMan = new DefaultLDAPEntityManager();
-        entityMan.setEntityDAOs(entityDAOs);
-        entityMan.setEntityRelationDAOs(entityRelationDAOs);
-        
-        
-        
+        DefaultLDAPEntityManager entityMan = new DefaultLDAPEntityManager(entityDAOs, entityRelationDAOs);
     }
 
     @Override

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
Wed Mar 31 13:38:34 2010
@@ -162,6 +162,12 @@ public class SecurityException extends J
 
     public static final KeyedMessage DEFAULT_SECURITY_DOMAIN_DOES_NOT_EXIST = new KeyedMessage("The
default security domain does not exist.");
 
+    /** <p>Entity association attribute undefined</p> */
+    public static final KeyedMessage ENTITY_ATTRIBUTE_UNDEFINED = new KeyedMessage("The attribute
{0} is undefined for entity {1}.");
+    
+    /** <p>Entity association attribute undefined</p> */
+    public static final KeyedMessage ENTITY_ATTRIBUTE_MULTIVALUE_UNSUPPORTED = new KeyedMessage("The
attribute {0} for entity {1} doesn't support multivalues.");    
+    
     /**
      * <p>Default Constructor.</p>
      */

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml?rev=929535&r1=929534&r2=929535&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
Wed Mar 31 13:38:34 2010
@@ -141,20 +141,20 @@
   <bean id="org.apache.jetspeed.security.mapping.SecurityEntityManager"
     class="org.apache.jetspeed.security.mapping.ldap.dao.DefaultLDAPEntityManager">
     <meta key="j2:cat" value="ldapSecurity" />
-    <property name="entityDAOs">
-      <map>
-        <entry key="user" value-ref="UserDao" />
-        <entry key="role" value-ref="RoleDao" />
-		<entry key="group" value-ref="GroupDao" />
-      </map>
-    </property>
-    <property name="entityRelationDAOs">
+    <constructor-arg index="0"> 
+      <list>
+        <ref bean="UserDao" />
+        <ref bean="RoleDao" />
+            <ref bean="GroupDao" />
+      </list>
+    </constructor-arg>
+    <constructor-arg index="1">
       <list>
         <ref bean="UserRoleRelationDAO" />
-		<ref bean="RoleGroupRelationDAO" />
-		<ref bean="UserGroupRelationDAO" />
+            <ref bean="RoleGroupRelationDAO" />
+            <ref bean="UserGroupRelationDAO" />
       </list>
-    </property>
+    </constructor-arg>
   </bean>
   
   <bean id="UserDaoConfiguration" class="org.apache.jetspeed.security.mapping.ldap.dao.LDAPEntityDAOConfiguration"
init-method="initialize">
@@ -232,8 +232,6 @@
           <constructor-arg index="1" value="true" />
           <constructor-arg index="2" value="false" />
           <property name="required" value="true" />
-          <!-- use 'magic' value #dn to have the entity own dn be used -->
-          <property name="requiredDefaultValue" value="#dn" />
         </bean>
       </set>
     </property>
@@ -271,8 +269,6 @@
           <constructor-arg index="1" value="true" />
           <constructor-arg index="2" value="false" />
           <property name="required" value="true" />
-          <!-- use 'magic' value #dn to have the entity own dn be used -->
-          <property name="requiredDefaultValue" value="#dn" />
         </bean>
       </set>
     </property>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message