You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2008/10/08 17:16:35 UTC
svn commit: r702904 - 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/ldap/dao/
components/jetspeed-se...
Author: vkumar
Date: Wed Oct 8 08:16:35 2008
New Revision: 702904
URL: http://svn.apache.org/viewvc?rev=702904&view=rev
Log:
Adding in trunk too
Code clean-up for ldap replications and new Error key for principal already having associations
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/EntityFactory.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AbstractRelationDAO.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/model/impl/EntityImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/EntityFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/EntityFactory.java?rev=702904&r1=702903&r2=702904&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/EntityFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/EntityFactory.java Wed Oct 8 08:16:35 2008
@@ -17,11 +17,9 @@
package org.apache.jetspeed.security.mapping;
import javax.naming.directory.DirContext;
-import javax.naming.ldap.LdapContext;
import org.apache.jetspeed.security.JetspeedPrincipal;
import org.apache.jetspeed.security.mapping.model.Entity;
-import org.springframework.ldap.core.DirContextOperations;
/**
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java?rev=702904&r1=702903&r2=702904&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java Wed Oct 8 08:16:35 2008
@@ -26,7 +26,6 @@
import org.apache.jetspeed.security.mapping.EntityFactory;
import org.apache.jetspeed.security.mapping.SecurityEntityManager;
import org.apache.jetspeed.security.mapping.SecurityEntityRelationType;
-import org.apache.jetspeed.security.mapping.impl.SecurityEntityRelationTypeImpl;
import org.apache.jetspeed.security.mapping.model.Entity;
/**
@@ -67,11 +66,6 @@
return entity.getType() != null ? entityDAOs.get(entity.getType()) : null;
}
- private EntityRelationDAO getRelationDAO(String relationType, String fromEntityType, String targetEntityType)
- {
- return entityRelationDAOs.get(new SecurityEntityRelationTypeImpl(relationType, fromEntityType, targetEntityType));
- }
-
public void addRelation(Entity sourceEntity, Entity targetEntity, SecurityEntityRelationType relationType) throws SecurityException
{
EntityRelationDAO relationDAO = entityRelationDAOs.get(relationType);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AbstractRelationDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AbstractRelationDAO.java?rev=702904&r1=702903&r2=702904&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AbstractRelationDAO.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AbstractRelationDAO.java Wed Oct 8 08:16:35 2008
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.security.mapping.ldap.dao.impl;
-import org.springframework.ldap.core.LdapTemplate;
-
import org.apache.jetspeed.security.mapping.SecurityEntityRelationType;
import org.apache.jetspeed.security.mapping.ldap.dao.EntityRelationDAO;
@@ -27,15 +25,9 @@
*/
public abstract class AbstractRelationDAO implements EntityRelationDAO
{
- private LdapTemplate ldapTemplate;
-
+
private SecurityEntityRelationType relationType;
- public void setLdapTemplate(LdapTemplate ldapTemplate)
- {
- this.ldapTemplate = ldapTemplate;
- }
-
public SecurityEntityRelationType getRelationType()
{
return relationType;
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/model/impl/EntityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/model/impl/EntityImpl.java?rev=702904&r1=702903&r2=702904&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/model/impl/EntityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/model/impl/EntityImpl.java Wed Oct 8 08:16:35 2008
@@ -19,7 +19,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
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=702904&r1=702903&r2=702904&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 Oct 8 08:16:35 2008
@@ -62,6 +62,9 @@
/** <p>Principal association dominant for mixed types exception message.</p> */
public static final KeyedMessage PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = new KeyedMessage("Only one {0} association is allowed to principal {1} from a {2}.");
+ /** <p>Principal association already exist with principal</p> */
+ public static final KeyedMessage PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = new KeyedMessage("Principal {0} already has association with {1}.");
+
/** <p>Principal association is not supported exception message.</p> */
public static final KeyedMessage PRINCIPAL_ASSOCIATION_UNSUPPORTED = new KeyedMessage("A {0} {1} association is not supported.");
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=702904&r1=702903&r2=702904&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 Oct 8 08:16:35 2008
@@ -248,11 +248,6 @@
<bean id="UserRoleRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
<meta key="j2:cat" value="ldapSecurity" />
- <property name="ldapTemplate">
- <bean class="org.springframework.ldap.core.LdapTemplate">
- <property name="contextSource" ref="LdapSpringContext" />
- </bean>
- </property>
<property name="relationAttribute" value="uniqueMember" />
<property name="attributeContainsInternalId" value="true" />
<property name="useFromEntityAttribute" value="false" />
@@ -267,11 +262,6 @@
<bean id="UserGroupRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
<meta key="j2:cat" value="ldapSecurity" />
- <property name="ldapTemplate">
- <bean class="org.springframework.ldap.core.LdapTemplate">
- <property name="contextSource" ref="LdapSpringContext" />
- </bean>
- </property>
<property name="relationAttribute" value="uniqueMember" />
<property name="attributeContainsInternalId" value="true" />
<property name="useFromEntityAttribute" value="false" />
@@ -286,11 +276,6 @@
<bean id="RoleGroupRelationDAO" class="org.apache.jetspeed.security.mapping.ldap.dao.impl.AttributeBasedRelationDAO">
<meta key="j2:cat" value="ldapSecurity" />
- <property name="ldapTemplate">
- <bean class="org.springframework.ldap.core.LdapTemplate">
- <property name="contextSource" ref="LdapSpringContext" />
- </bean>
- </property>
<property name="relationAttribute" value="member" />
<property name="attributeContainsInternalId" value="true" />
<property name="useFromEntityAttribute" value="true" />
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org