portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vku...@apache.org
Subject svn commit: r702026 - in /portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao: ./ impl/
Date Mon, 06 Oct 2008 09:04:34 GMT
Author: vkumar
Date: Mon Oct  6 02:04:34 2008
New Revision: 702026

URL: http://svn.apache.org/viewvc?rev=702026&view=rev
Log:
Addding security exceptions

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/EntityRelationDAO.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java

Modified: portals/jetspeed-2/portal/branches/security-refactoring/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/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java?rev=702026&r1=702025&r2=702026&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/DefaultLDAPEntityManager.java
Mon Oct  6 02:04:34 2008
@@ -72,7 +72,7 @@
         return entityRelationDAOs.get(new SecurityEntityRelationTypeImpl(relationType, fromEntityType,
targetEntityType));
     }
 
-    public void addRelation(Entity sourceEntity, Entity targetEntity, SecurityEntityRelationType
relationType)
+    public void addRelation(Entity sourceEntity, Entity targetEntity, SecurityEntityRelationType
relationType) throws SecurityException
     {
         EntityRelationDAO relationDAO = entityRelationDAOs.get(relationType);
         if (relationDAO != null)

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/EntityRelationDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/EntityRelationDAO.java?rev=702026&r1=702025&r2=702026&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/EntityRelationDAO.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/EntityRelationDAO.java
Mon Oct  6 02:04:34 2008
@@ -18,6 +18,7 @@
 
 import java.util.Collection;
 
+import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.mapping.SecurityEntityRelationType;
 import org.apache.jetspeed.security.mapping.model.Entity;
 
@@ -37,8 +38,8 @@
             EntityDAO toDao, Entity toEntity);
 
     void addRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
-            Entity targetEntity);
+            Entity targetEntity) throws SecurityException;
 
     void removeRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
-                Entity targetEntity);   
+                Entity targetEntity) throws SecurityException;
 }

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java?rev=702026&r1=702025&r2=702026&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/mapping/ldap/dao/impl/AttributeBasedRelationDAO.java
Mon Oct  6 02:04:34 2008
@@ -19,12 +19,12 @@
 import java.util.Collection;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.ldap.filter.EqualsFilter;
-import org.springframework.ldap.filter.Filter;
-
+import org.apache.jetspeed.security.SecurityException;
 import org.apache.jetspeed.security.mapping.ldap.dao.EntityDAO;
 import org.apache.jetspeed.security.mapping.model.Attribute;
 import org.apache.jetspeed.security.mapping.model.Entity;
+import org.springframework.ldap.filter.EqualsFilter;
+import org.springframework.ldap.filter.Filter;
 
 /**
  * DAO for fetching relationships between LDAP entities. A relationship between two entities
is created by adding an attribute value to either the entity on the
@@ -119,7 +119,7 @@
         this.attributeContainsInternalId = attributeContainsInternalId;
     }
 
-    private void internalAddRelation(EntityDAO fromEntityDAO, EntityDAO toEntityDAO, Entity
fromEntity, Entity toEntity)
+    private void internalAddRelation(EntityDAO fromEntityDAO, EntityDAO toEntityDAO, Entity
fromEntity, Entity toEntity) throws SecurityException
     {
         String attrValue = null;
         if (attributeContainsInternalId)
@@ -147,7 +147,7 @@
         fromEntityDAO.updateInternalAttributes(fromEntity);
     }
 
-    private void internalRemoveRelation(EntityDAO fromEntityDAO, EntityDAO toEntityDAO, Entity
fromEntity, Entity toEntity)
+    private void internalRemoveRelation(EntityDAO fromEntityDAO, EntityDAO toEntityDAO, Entity
fromEntity, Entity toEntity) throws SecurityException
     {
         String attrValue = null;
         if (attributeContainsInternalId)
@@ -174,7 +174,7 @@
         }
         fromEntityDAO.updateInternalAttributes(fromEntity);
     }
-    public void addRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
Entity targetEntity)
+    public void addRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
Entity targetEntity) throws SecurityException
     {
         if (useFromEntityAttribute)
         {
@@ -186,7 +186,7 @@
         }
     }
 
-    public void removeRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
Entity targetEntity)
+    public void removeRelation(EntityDAO sourceDao, EntityDAO targetDao, Entity sourceEntity,
Entity targetEntity) throws SecurityException
     {
         if (useFromEntityAttribute)
         {



---------------------------------------------------------------------
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