directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r564501 [4/7] - in /directory/sandbox/djencks/triplesec-jacc2: ./ admin-api/ admin-api2/ admin-api2/src/main/java/org/apache/ admin-api2/src/main/java/org/apache/directory/ admin-api2/src/main/java/org/apache/directory/triplesec/ admin-api2...
Date Fri, 10 Aug 2007 07:59:59 GMT
Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModule.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModule.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModule.java Fri Aug 10 00:58:38 2007
@@ -18,10 +18,9 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import java.util.Map;
-import java.util.HashMap;
 import java.security.Principal;
 
 import javax.security.auth.spi.LoginModule;
@@ -29,10 +28,10 @@
 import javax.security.auth.login.LoginException;
 import javax.security.auth.callback.CallbackHandler;
 
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TriplesecRealmPrincipalLoginModule implements LoginModule
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/LdapBindLoginModuleIntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/LdapBindLoginModuleIntegrationTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/LdapBindLoginModuleIntegrationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/LdapBindLoginModuleIntegrationTest.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -31,7 +31,7 @@
 import javax.security.auth.spi.LoginModule;
 import javax.naming.Context;
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 import org.apache.directory.triplesec.jaas.TestLoginConfiguration;
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/SafehausLoginModuleTest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 
 

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModuleTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModuleTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModuleTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipalLoginModuleTest.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -36,17 +36,17 @@
 
 import junit.framework.TestCase;
 import org.apache.directory.triplesec.jaas.TestLoginConfiguration;
-import org.safehaus.triplesec.guardian.RealmPolicy;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.Roles;
-import org.safehaus.triplesec.guardian.Role;
-import org.safehaus.triplesec.guardian.StringPermission;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.PolicyChangeListener;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.Roles;
+import org.apache.directory.triplesec.guardian.Role;
+import org.apache.directory.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.PolicyChangeListener;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TriplesecRealmPrincipalLoginModuleTest extends TestCase
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/UPCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/UPCallbackHandler.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/UPCallbackHandler.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/test/java/org/apache/directory/triplesec/jaas/UPCallbackHandler.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import java.io.IOException;
 
@@ -29,7 +29,7 @@
 import javax.security.auth.callback.PasswordCallback;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class UPCallbackHandler implements CallbackHandler
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml Fri Aug 10 00:58:38 2007
@@ -102,7 +102,7 @@
                         <configuration>
                             <systemProperties>
                                 <property>
-                                    <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                                    <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                                     <value>${basedir}/src/test</value>
                                 </property>
                             </systemProperties>

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/DataPolicyConfiguration.java Fri Aug 10 00:58:38 2007
@@ -28,9 +28,9 @@
 import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyContextException;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.persistence.EntityManager;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.persistence.EntityManager;
 
 /**
  * @version $Rev$ $Date$
@@ -90,7 +90,7 @@
         String permissionName = permission.getName();
         String permissionActions = permission.getActions();
         String permissionId = nextPermissionId();
-        org.safehaus.triplesec.admin.Permission permissionData = new org.safehaus.triplesec.admin.Permission( permissionId, null, permissionClassName, permissionName, permissionActions );
+        org.apache.directory.triplesec.admin.Permission permissionData = new org.apache.directory.triplesec.admin.Permission( permissionId, null, permissionClassName, permissionName, permissionActions );
         context.addPermission( permissionData );
         role.addGrant( permissionData );
     }
@@ -117,7 +117,7 @@
         String permissionName = permission.getName();
         String permissionActions = permission.getActions();
         String permissionId = nextPermissionId();
-        org.safehaus.triplesec.admin.Permission permissionData = new org.safehaus.triplesec.admin.Permission( permissionId, null, permissionClassName, permissionName, permissionActions );
+        org.apache.directory.triplesec.admin.Permission permissionData = new org.apache.directory.triplesec.admin.Permission( permissionId, null, permissionClassName, permissionName, permissionActions );
         context.addPermission( permissionData );
         role.addDenial( permissionData );
     }

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/PermissionKey.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/PermissionKey.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/PermissionKey.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/PermissionKey.java Fri Aug 10 00:58:38 2007
@@ -20,10 +20,10 @@
 
 package org.apache.directory.triplesec.jacc;
 
-import org.safehaus.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Permission;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PermissionKey
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfiguration.java Fri Aug 10 00:58:38 2007
@@ -25,8 +25,8 @@
 import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyContextException;
 
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.jaas.TriplesecRealmPrincipal;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.jaas.TriplesecRealmPrincipal;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/src/main/java/org/apache/directory/triplesec/jacc/TripleSecPolicyConfigurationFactory.java Fri Aug 10 00:58:38 2007
@@ -35,8 +35,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.safehaus.triplesec.admin.persistence.EntityManager;
-import org.safehaus.triplesec.admin.persistence.EntityManagerImpl;
+import org.apache.directory.triplesec.admin.persistence.EntityManager;
+import org.apache.directory.triplesec.admin.persistence.EntityManagerImpl;
 
 /**
  * @version $Rev$ $Date$

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/src/test/java/org/apache/directory/triplesec/jacc/TripleSecPolicyIntegrationTest.java Fri Aug 10 00:58:38 2007
@@ -46,14 +46,14 @@
 import javax.security.jacc.PolicyContext;
 import javax.security.jacc.PolicyConfiguration;
 
-import org.safehaus.triplesec.guardian.RealmPolicy;
-import org.safehaus.triplesec.guardian.RealmPolicyFactory;
-import org.safehaus.triplesec.guardian.StringPermission;
-import org.safehaus.triplesec.guardian.StoreConnectionException;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.TriplesecRealmPrincipalLoginModule;
-import org.safehaus.triplesec.jaas.LdapBindLoginModule;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.RealmPolicyFactory;
+import org.apache.directory.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.StoreConnectionException;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.TriplesecRealmPrincipalLoginModule;
+import org.apache.directory.triplesec.jaas.LdapBindLoginModule;
 
 /**
  * @version $Rev$ $Date$
@@ -92,7 +92,7 @@
         props.setProperty( "java.naming.security.credentials", "secret" );
         props.setProperty( "java.naming.security.authentication", "simple" );
 
-        Class.forName("org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver");
+        Class.forName("org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver");
 
 
         if (!POLICY_INSTALLED) {

Modified: directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml Fri Aug 10 00:58:38 2007
@@ -11,8 +11,8 @@
         <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
         <prop key="java.naming.security.credentials">secret</prop>
         <prop key="java.naming.provider.url">dc=example,dc=com</prop>
-        <prop key="java.naming.factory.state">org.safehaus.triplesec.store.ProfileStateFactory</prop>
-        <prop key="java.naming.factory.object">org.safehaus.triplesec.store.ProfileObjectFactory</prop>
+        <prop key="java.naming.factory.state">org.apache.directory.triplesec.store.ProfileStateFactory</prop>
+        <prop key="java.naming.factory.object">org.apache.directory.triplesec.store.ProfileObjectFactory</prop>
 
         <prop key="kdc.primary.realm">EXAMPLE.COM</prop>
         <prop key="kdc.principal">krbtgt/EXAMPLE.COM@EXAMPLE.COM</prop>
@@ -37,12 +37,12 @@
 
         <prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
         <prop key="safehaus.load.testdata">true</prop>
-        <prop key="kerberos.sam.type.7">org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
+        <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>
@@ -121,7 +121,7 @@
         <bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
         <bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
         <bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
-        <bean class="org.safehaus.triplesec.store.schema.SafehausSchema"/>
+        <bean class="org.apache.directory.triplesec.store.schema.SafehausSchema"/>
       </set>
     </property>
     
@@ -203,7 +203,7 @@
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name"><value>policyProtectionService</value></property>
           <property name="interceptor">
-            <bean class="org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor" />
+            <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
           </property>
         </bean>
       </list>

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingHotpMonitor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingHotpMonitor.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.safehaus.triplesec.verifier.hotp.HotpMonitor;
+import org.apache.directory.triplesec.verifier.hotp.HotpMonitor;
 import org.safehaus.profile.ServerProfile;
 import org.safehaus.otp.ResynchParameters;
 

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/LoggingStoreMonitor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/LoggingStoreMonitor.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 
 import javax.naming.directory.Attributes;
@@ -26,8 +26,8 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
-import org.safehaus.triplesec.store.StoreMonitorAdapter;
+import org.apache.directory.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.StoreMonitorAdapter;
 
 
 /**

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/Service.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/Service.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/Service.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 
 import java.io.File;
@@ -34,7 +34,6 @@
 import org.apache.directory.daemon.InstallationLayout;
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.core.configuration.SyncConfiguration;
-import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
 import org.apache.directory.server.kerberos.sam.SamSubsystem;
 import org.apache.directory.server.configuration.MutableServerStartupConfiguration;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -47,9 +46,8 @@
 import org.safehaus.profile.BaseServerProfileModifier;
 import org.safehaus.profile.ProfileTestData;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
-import org.safehaus.triplesec.store.DefaultServerProfileStore;
-import org.safehaus.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.DefaultServerProfileStore;
+import org.apache.directory.triplesec.store.ServerProfileStore;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecInstallationLayout.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecInstallationLayout.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 import java.io.File;
 

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplesecUberjarMain.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplesecUberjarMain.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 import java.io.File;
 

Copied: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java (from r564498, directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java?view=diff&rev=564501&p1=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java&r1=564498&p2=directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/safehaus/triplesec/TriplsecContextFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/TriplsecContextFactory.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec;
+package org.apache.directory.triplesec;
 
 
 import org.apache.directory.server.jndi.ServerContextFactory;

Modified: directory/sandbox/djencks/triplesec-jacc2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/pom.xml Fri Aug 10 00:58:38 2007
@@ -616,7 +616,7 @@
                       <exclude name="directory"/>
                     </dirset>
                   </sourcepath>
-                  <package name="org.safehaus.triplesec.*"/>
+                  <package name="org.apache.directory.triplesec.*"/>
                 </javadoc>
               </tasks>
             </configuration>

Modified: directory/sandbox/djencks/triplesec-jacc2/store/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/pom.xml Fri Aug 10 00:58:38 2007
@@ -92,7 +92,7 @@
           <schemas>
             <schema>
               <name>safehaus</name>
-              <pkg>org.safehaus.triplesec.store.schema</pkg>
+              <pkg>org.apache.directory.triplesec.store.schema</pkg>
               <dependencies>
                 <dependency>system</dependency>
                 <dependency>core</dependency>

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/DefaultServerProfileStore.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import java.util.ArrayList;
@@ -168,7 +168,7 @@
 
     public void delete( KerberosPrincipal principal ) throws NamingException
     {
-        String msg = "delete in org.safehaus.triplesec.store.DefaultServerProfileStore not implemented!";
+        String msg = "delete in org.apache.directory.triplesec.store.DefaultServerProfileStore not implemented!";
         throw new NotImplementedException( msg );
     }
 

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import java.util.Hashtable;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileStateFactory.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import java.util.Hashtable;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ServerProfileStore.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import javax.naming.NamingException;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitor.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -25,7 +25,7 @@
 import javax.naming.directory.Attributes;
 
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.ServerProfileStore;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/StoreMonitorAdapter.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -25,8 +25,8 @@
 import javax.naming.directory.Attributes;
 
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.ServerProfileStore;
-import org.safehaus.triplesec.store.StoreMonitor;
+import org.apache.directory.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.StoreMonitor;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
 
 
 import java.util.Collection;
@@ -29,7 +29,6 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
 
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.partition.PartitionNexusProxy;
@@ -37,7 +36,6 @@
 import org.apache.directory.server.core.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
-import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ProfileFactoryITest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import javax.naming.directory.Attributes;
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.safehaus.profile.ServerProfile;
 import org.safehaus.profile.BaseServerProfileModifier;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 
 import java.util.Set;
 import java.util.HashSet;

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/ServerProfileStoreITest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store;
+package org.apache.directory.triplesec.store;
 
 
 import java.io.File;
@@ -53,7 +53,7 @@
 import org.safehaus.profile.BaseServerProfileModifier;
 import org.safehaus.profile.ProfileTestData;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 import junit.framework.TestCase;
 
 

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/ApplicationACIManagerITest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
 
 
 import java.util.Hashtable;
@@ -38,7 +38,6 @@
 import org.apache.directory.server.core.configuration.Configuration;
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.configuration.MutableInterceptorConfiguration;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.schema.bootstrap.Krb5kdcSchema;
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
@@ -49,9 +48,9 @@
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.store.ProfileObjectFactory;
-import org.safehaus.triplesec.store.ProfileStateFactory;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.ProfileObjectFactory;
+import org.apache.directory.triplesec.store.ProfileStateFactory;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/test/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptorITest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.store.interceptor;
+package org.apache.directory.triplesec.store.interceptor;
 
 
 import java.util.HashSet;
@@ -48,9 +48,9 @@
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.server.schema.registries.DefaultRegistries;
-import org.safehaus.triplesec.store.ProfileObjectFactory;
-import org.safehaus.triplesec.store.ProfileStateFactory;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.ProfileObjectFactory;
+import org.apache.directory.triplesec.store.ProfileStateFactory;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/pom.xml Fri Aug 10 00:58:38 2007
@@ -104,7 +104,7 @@
           <archive>
             <manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>
             <manifest>
-              <mainClass>org.safehaus.triplesec.admin.swing.AdminFrame</mainClass>
+              <mainClass>org.apache.directory.triplesec.admin.swing.AdminFrame</mainClass>
             </manifest>
           </archive>
         </configuration>
@@ -181,7 +181,7 @@
                   <value>${basedir}/target/settingsFile</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
               </systemProperties>
@@ -210,7 +210,7 @@
               </argLine>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
                 <property>

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminFrame.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -44,15 +44,15 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -976,7 +976,7 @@
 
             try
             {
-                Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+                Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
             }
             catch ( ClassNotFoundException e1 )
             {

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/AdminToolSettings.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 
 
 public class AdminToolSettings

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ApplicationPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;
@@ -38,8 +38,8 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
 import javax.swing.JPasswordField;
 import javax.naming.NamingException;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/Carrier.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 public class Carrier

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConfigurationFileManager.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -36,8 +36,8 @@
 import javax.swing.JProgressBar;
 import javax.swing.filechooser.FileFilter;
 
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionDialog.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfo.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import org.apache.directory.shared.ldap.util.NamespaceTools;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionInfoModifier.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ConnectionManager.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.io.IOException;
@@ -35,15 +35,15 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginException;
 
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.configuration.TriplesecStartupConfiguration;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.configuration.TriplesecStartupConfiguration;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ExternalLinkPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -33,7 +33,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.safehaus.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUser;
 
 
 public class ExternalLinkPanel extends JPanel implements StatusObject, KeyListener, FocusListener

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GeneralPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.GridBagConstraints;
@@ -27,7 +27,7 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.safehaus.triplesec.admin.AdministeredEntity;
+import org.apache.directory.triplesec.admin.AdministeredEntity;
 
 
 public class GeneralPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -38,9 +38,9 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 
 public class GroupPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/GroupUsersPanel.java Fri Aug 10 00:58:38 2007
@@ -17,15 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Set;
 import java.util.Collection;
 
 import javax.swing.DefaultListModel;
@@ -36,7 +34,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.User;
 
 
 public class GroupUsersPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/HotpSettingsPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/HotpSettingsPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/HotpSettingsPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/HotpSettingsPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.GridBagConstraints;
@@ -32,7 +32,7 @@
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;
 
-import org.safehaus.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUser;
 
 
 public class HotpSettingsPanel extends JPanel implements StatusObject, KeyListener, FocusListener

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeCellRenderer.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.Component;
@@ -27,14 +27,14 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeNavigation.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeNavigation.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeNavigation.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LeftTreeNavigation.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.GridLayout;
@@ -33,12 +33,12 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LoginDialog.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LoginDialog.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LoginDialog.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/LoginDialog.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewApplicationPanel.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.HashSet;
 
 import javax.swing.ImageIcon;
@@ -44,12 +43,12 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
 
 import javax.swing.JPasswordField;
 import javax.naming.NamingException;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewGroupPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -44,9 +44,9 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.User;
 
 
 public class NewGroupPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewPermissionPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -41,10 +41,9 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 
 public class NewPermissionPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewProfilePanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -25,9 +25,6 @@
 import java.awt.GridBagLayout;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Collection;
-import java.util.Set;
-import java.util.HashSet;
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.ImageIcon;
@@ -47,12 +44,10 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 import javax.swing.JComboBox;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewRolePanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -25,9 +25,6 @@
 import java.awt.GridBagLayout;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Collection;
-import java.util.Set;
-import java.util.HashSet;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -46,11 +43,9 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 
 public class NewRolePanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/NewUserPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -45,12 +45,12 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 
 public class NewUserPanel extends JPanel implements StatusListener, StatusObject, KeyListener, FocusListener

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionDependentsPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionDependentsPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionDependentsPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionDependentsPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;
@@ -45,10 +45,9 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.naming.NamingException;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
 
 
 public class PermissionDependentsPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/PermissionPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;
@@ -39,8 +39,7 @@
 import javax.swing.tree.TreePath;
 import javax.naming.NamingException;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Permission;
 
 
 public class PermissionPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import javax.swing.JPanel;
@@ -35,7 +35,6 @@
 import java.awt.GridBagLayout;
 import java.awt.GridBagConstraints;
 import java.util.Enumeration;
-import java.util.Set;
 import java.util.Collection;
 
 import javax.swing.JTextField;
@@ -44,13 +43,13 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.persistence.PCException;
 
 import javax.swing.JComboBox;
 import javax.swing.JCheckBox;

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePermissionsPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePermissionsPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePermissionsPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfilePermissionsPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -25,7 +25,6 @@
 import java.awt.GridBagLayout;
 import java.util.Enumeration;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.Collection;
 
 import javax.swing.DefaultListModel;
@@ -36,7 +35,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.safehaus.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Permission;
 
 
 public class ProfilePermissionsPanel extends JPanel

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfileRolesPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfileRolesPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfileRolesPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProfileRolesPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.BorderLayout;
@@ -25,7 +25,6 @@
 import java.awt.GridBagLayout;
 import java.util.Enumeration;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.Collection;
 
 import javax.swing.DefaultListModel;
@@ -36,7 +35,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Role;
 
 
 public class ProfileRolesPanel extends JPanel



Mime
View raw message