directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r491392 - in /directory/sandbox/triplesec-jacc: jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java pom.xml
Date Sun, 31 Dec 2006 05:47:07 GMT
Author: djencks
Date: Sat Dec 30 21:47:06 2006
New Revision: 491392

URL: http://svn.apache.org/viewvc?view=rev&rev=491392
Log:
hook the jacc module up to the build, make it use the old triplesec package names.  Build
ok without -Pintegration

Modified:
    directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java
    directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java
    directory/sandbox/triplesec-jacc/pom.xml

Modified: directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java?view=diff&rev=491392&r1=491391&r2=491392
==============================================================================
--- directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java
(original)
+++ directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java
Sat Dec 30 21:47:06 2006
@@ -26,13 +26,11 @@
 import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyContextException;
 
-import org.apache.directory.triplesec.guardian.Profile;
-import org.apache.directory.triplesec.jaas.SafehausPrincipal;
-import org.apache.directory.triplesec.admin.dao.DaoFactory;
-import org.apache.directory.triplesec.admin.dao.ApplicationDao;
-import org.apache.directory.triplesec.admin.dao.RoleDao;
-import org.apache.directory.triplesec.admin.Application;
-import org.apache.directory.triplesec.admin.DataAccessException;
+import org.safehaus.triplesec.admin.DataAccessException;
+import org.safehaus.triplesec.admin.dao.DaoFactory;
+import org.safehaus.triplesec.admin.dao.RoleDao;
+import org.safehaus.triplesec.guardian.Profile;
+import org.safehaus.triplesec.jaas.SafehausPrincipal;
 
 
 /**
@@ -67,10 +65,9 @@
         Principal[] principals = domain.getPrincipals();
         if (principals.length == 0) return false;
 
-        for (int i = 0; i < principals.length; i++) {
-            Principal principal = principals[i];
+        for (Principal principal : principals) {
             if (principal instanceof SafehausPrincipal) {
-                Profile profile = ((SafehausPrincipal)principal).getAuthorizationProfile(contextID);
+                Profile profile = ((SafehausPrincipal) principal).getAuthorizationProfile(contextID);
 
                 return profile.implies(permission);
 
@@ -91,7 +88,7 @@
 
     public void addToRole(String roleName, Permission permission) throws PolicyContextException
{
         if (state != OPEN) throw new UnsupportedOperationException("Not in an open state");
-        
+
         //TODO Install contextId/rolename to permission association in TripleSec LDAP
     }
 

Modified: directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java?view=diff&rev=491392&r1=491391&r2=491392
==============================================================================
--- directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java
(original)
+++ directory/sandbox/triplesec-jacc/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java
Sat Dec 30 21:47:06 2006
@@ -27,8 +27,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.directory.triplesec.admin.dao.DaoFactory;
-import org.apache.directory.triplesec.admin.DataAccessException;
+import org.safehaus.triplesec.admin.dao.DaoFactory;
+import org.safehaus.triplesec.admin.DataAccessException;
 
 /**
  * @version $Rev$ $Date$

Modified: directory/sandbox/triplesec-jacc/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/pom.xml?view=diff&rev=491392&r1=491391&r2=491392
==============================================================================
--- directory/sandbox/triplesec-jacc/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/pom.xml Sat Dec 30 21:47:06 2006
@@ -124,6 +124,11 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_2.4_spec</artifactId>
         <version>1.0.1</version>
       </dependency>
@@ -637,6 +642,7 @@
         <module>profile</module>
         <module>testdata</module>
         <module>jaas</module>
+        <module>jacc</module>
         <module>sms</module>
         <module>itest-data</module>
         <module>store</module>
@@ -678,6 +684,7 @@
         <module>profile</module>
         <module>testdata</module>
         <module>jaas</module>
+        <module>jacc</module>
         <module>sms</module>
         <module>store</module>
         <module>verifier</module>
@@ -734,6 +741,7 @@
         <module>profile</module>
         <module>testdata</module>
         <module>jaas</module>
+        <module>jacc</module>
         <module>sms</module>
         <module>store</module>
         <module>verifier</module>



Mime
View raw message