You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2007/08/10 09:59:59 UTC

svn commit: r564501 [3/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...

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml Fri Aug 10 00:58:38 2007
@@ -3,7 +3,7 @@
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="WebApp_ID" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">  
   <filter> 
     <filter-name>activation</filter-name>  
-    <filter-class>org.safehaus.triplesec.activation.ActivateAccountFilter</filter-class>  
+    <filter-class>org.apache.directory.triplesec.activation.ActivateAccountFilter</filter-class>
     <init-param> 
       <param-name>PROVIDER_URL</param-name>  
       <param-value>ldap://localhost:10389/ou=users,dc=example,dc=com</param-value> 

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValueInitial.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValueInitial.xml Fri Aug 10 00:58:38 2007
@@ -10,7 +10,7 @@
     <servlet-class>wicket.protocol.http.WicketServlet</servlet-class>
     <init-param>
       <param-name>applicationClassName</param-name>
-      <param-value>org.safehaus.triplesec.configui.view.TripleSecConfigApplication</param-value>
+      <param-value>org.apache.directory.triplesec.configui.view.TripleSecConfigApplication</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>

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

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

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

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

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/EntryApplicationPolicy.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.guardian;
+package org.apache.directory.triplesec.guardian;
 
 import java.security.Permission;
 import java.security.Permissions;
@@ -44,7 +44,7 @@
     protected String description;
     /** the {@link java.security.Permission}s defined for this store's application */
     protected final Map<String, Permission> permissions = new HashMap<String, Permission>();
-    /** the {@link org.safehaus.triplesec.guardian.Role}s defined for this store's application */
+    /** the {@link org.apache.directory.triplesec.guardian.Role}s defined for this store's application */
     protected Roles roles;
 
     protected Permissions getAllPermissions() {

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/PermissionsUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/PermissionsUtil.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/PermissionsUtil.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/PermissionsUtil.java Fri Aug 10 00:58:38 2007
@@ -18,10 +18,9 @@
  */
 
 
-package org.safehaus.triplesec.guardian;
+package org.apache.directory.triplesec.guardian;
 
 import java.util.Enumeration;
-import java.util.Set;
 import java.security.Permission;
 import java.security.Permissions;
 

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicy.java Fri Aug 10 00:58:38 2007
@@ -18,12 +18,12 @@
  */
 
 
-package org.safehaus.triplesec.guardian;
+package org.apache.directory.triplesec.guardian;
 
 /**
  * Supplies a profile (role?) for a given sub-application and profileId (roleId)
  * 
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface RealmPolicy
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicyFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicyFactory.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicyFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/main/java/org/apache/directory/triplesec/guardian/RealmPolicyFactory.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.guardian;
+package org.apache.directory.triplesec.guardian;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -105,8 +105,8 @@
      * URLs are separated by whitespace characters.  This operation tries the specified
      * URLs in random order to distribute server-side load.
      *
-     * @param urls the whitespace-separated URLs of the {@link org.safehaus.triplesec.guardian.ApplicationPolicy}
-     * @param info the extra information to pass to {@link org.safehaus.triplesec.guardian.ConnectionDriver}
+     * @param urls the whitespace-separated URLs of the {@link org.apache.directory.triplesec.guardian.ApplicationPolicy}
+     * @param info the extra information to pass to {@link org.apache.directory.triplesec.guardian.ConnectionDriver}
      * @return the connected store
      * @throws GuardianException if failed to connect to the store
      */

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

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

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

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

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

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

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicy.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.mock;
+package org.apache.directory.triplesec.guardian.mock;
 
 
 import java.security.Permissions;
@@ -29,13 +29,13 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.PolicyChangeListener;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Role;
-import org.safehaus.triplesec.guardian.Roles;
-import org.safehaus.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.PolicyChangeListener;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Role;
+import org.apache.directory.triplesec.guardian.Roles;
+import org.apache.directory.triplesec.guardian.StringPermission;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicyTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicyTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockApplicationPolicyTest.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.mock;
+package org.apache.directory.triplesec.guardian.mock;
 
 
 import junit.framework.TestCase;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.StringPermission;
-import org.safehaus.triplesec.guardian.PermissionsUtil;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.PermissionsUtil;
 
 
 /**
@@ -41,7 +41,7 @@
     protected void setUp() throws Exception
     {
         super.setUp();
-        Class.forName( "org.safehaus.triplesec.guardian.mock.MockConnectionDriver" );
+        Class.forName( "org.apache.directory.triplesec.guardian.mock.MockConnectionDriver" );
         store = ( MockApplicationPolicy ) ApplicationPolicyFactory.newInstance( "mockApplication", null );
     }
 

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockConnectionDriver.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockConnectionDriver.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockConnectionDriver.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-api/src/test/java/org/apache/directory/triplesec/guardian/mock/MockConnectionDriver.java Fri Aug 10 00:58:38 2007
@@ -17,16 +17,16 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.mock;
+package org.apache.directory.triplesec.guardian.mock;
 
 
 import java.util.Properties;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.ConnectionDriver;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ConnectionDriver;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
 
 
 /**

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicy.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldap;
+package org.apache.directory.triplesec.guardian.ldap;
 
 
 import java.security.Permission;
@@ -26,7 +26,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 import java.util.Set;
 
 import javax.naming.NamingEnumeration;
@@ -42,13 +41,13 @@
 import javax.naming.event.NamingExceptionEvent;
 import javax.naming.event.ObjectChangeListener;
 
-import org.safehaus.triplesec.guardian.ChangeType;
-import org.safehaus.triplesec.guardian.EntryApplicationPolicy;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.PolicyChangeListener;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Role;
-import org.safehaus.triplesec.guardian.Roles;
+import org.apache.directory.triplesec.guardian.ChangeType;
+import org.apache.directory.triplesec.guardian.EntryApplicationPolicy;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.PolicyChangeListener;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Role;
+import org.apache.directory.triplesec.guardian.Roles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapConnectionDriver.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapConnectionDriver.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapConnectionDriver.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/main/java/org/apache/directory/triplesec/guardian/ldap/LdapConnectionDriver.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldap;
+package org.apache.directory.triplesec.guardian.ldap;
 
 
 import java.util.Hashtable;
@@ -27,12 +27,12 @@
 import javax.naming.NamingException;
 import javax.naming.directory.InitialDirContext;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.ConnectionDriver;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.StoreConnectionException;
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ConnectionDriver;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.StoreConnectionException;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
 
 
 /**

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/GuardianClient.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/GuardianClient.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/GuardianClient.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/GuardianClient.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldap;
+package org.apache.directory.triplesec.guardian.ldap;
 
 
 import java.util.Properties;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
 
 
 /**
@@ -40,7 +40,7 @@
         props.setProperty( "applicationRDN", "appName=mockApplication,ou=applications" );
         props.setProperty( "applicationCredentials", "testing" );
 
-        Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+        Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
         ApplicationPolicyFactory.newInstance( "ldap://localhost:10389/dc=example,dc=com", props );
         
         System.out.print( "Type any key to stop: " );

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicyIntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicyIntegrationTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicyIntegrationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/src/test/java/org/apache/directory/triplesec/guardian/ldap/LdapApplicationPolicyIntegrationTest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldap;
+package org.apache.directory.triplesec.guardian.ldap;
 
 
 import java.util.HashSet;
@@ -35,15 +35,15 @@
 import javax.naming.directory.ModificationItem;
 import javax.naming.ldap.InitialLdapContext;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.ChangeType;
-import org.safehaus.triplesec.guardian.StringPermission;
-import org.safehaus.triplesec.guardian.PolicyChangeListener;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Role;
-import org.safehaus.triplesec.guardian.PermissionsUtil;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ChangeType;
+import org.apache.directory.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.PolicyChangeListener;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Role;
+import org.apache.directory.triplesec.guardian.PermissionsUtil;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 /**
@@ -86,7 +86,7 @@
         props.setProperty( "applicationRDN", "appName=mockContext,appName=" + APP_NAME + ",ou=applications" );
         props.setProperty( "applicationCredentials", "testing" );
 
-        Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+        Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
         store = ( LdapApplicationPolicy ) ApplicationPolicyFactory.
                 newInstance( "ldap://localhost:"+super.getLdapPort()+"/dc=example,dc=com", props );
     }

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicy.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldif;
+package org.apache.directory.triplesec.guardian.ldif;
 
 
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.safehaus.triplesec.guardian.*;
+import org.apache.directory.triplesec.guardian.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifConnectionDriver.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifConnectionDriver.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifConnectionDriver.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/main/java/org/apache/directory/triplesec/guardian/ldif/LdifConnectionDriver.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldif;
+package org.apache.directory.triplesec.guardian.ldif;
 
 
 import java.io.File;
@@ -29,11 +29,11 @@
 import java.net.URL;
 import java.util.Properties;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.ConnectionDriver;
-import org.safehaus.triplesec.guardian.GuardianException;
-import org.safehaus.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ConnectionDriver;
+import org.apache.directory.triplesec.guardian.GuardianException;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
 
 
 /**

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

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/test/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/test/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicyTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/test/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicyTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldif/src/test/java/org/apache/directory/triplesec/guardian/ldif/LdifApplicationPolicyTest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.ldif;
+package org.apache.directory.triplesec.guardian.ldif;
 
 
 import junit.framework.TestCase;
@@ -28,10 +28,10 @@
 import java.util.Set;
 import java.net.URL;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.StringPermission;
-import org.safehaus.triplesec.guardian.PermissionsUtil;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.PermissionsUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +68,7 @@
         props.setProperty( "applicationPrincipalDN", "appName=mockApplication,ou=applications,dc=example,dc=com" );
         props.setProperty( "applicationRDN", "appName=mockContext,appName=mockApplication,ou=applications" );
         props.setProperty( "realmDN", "dc=example,dc=com" );
-        Class.forName( "org.safehaus.triplesec.guardian.ldif.LdifConnectionDriver" );
+        Class.forName( "org.apache.directory.triplesec.guardian.ldif.LdifConnectionDriver" );
         URL ldifURL = getClass().getClassLoader().getResource("server.ldif");
         String url = ldifURL.toString();
         log.info( "using url for ldif file: " + url );

Modified: directory/sandbox/djencks/triplesec-jacc2/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/installers/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/installers/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/installers/pom.xml Fri Aug 10 00:58:38 2007
@@ -212,7 +212,7 @@
           <packageDocs>true</packageDocs>
 -->
           <applicationClass>
-            org.safehaus.triplesec.Service
+            org.apache.directory.triplesec.Service
           </applicationClass>
           <packagedFiles>
             <packagedFile>

Modified: directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/bootstrapper.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/bootstrapper.properties?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/bootstrapper.properties (original)
+++ directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/bootstrapper.properties Fri Aug 10 00:58:38 2007
@@ -1,2 +1,2 @@
-bootstrap.start.class=org.safehaus.triplesec.Service
-bootstrap.stop.class=org.safehaus.triplesec.Service
+bootstrap.start.class=org.apache.directory.triplesec.Service
+bootstrap.stop.class=org.apache.directory.triplesec.Service

Modified: directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/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>
@@ -122,7 +122,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>
     
@@ -204,7 +204,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>

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

Modified: directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.integration;
+package org.apache.directory.triplesec.integration;
 
 
 import junit.framework.TestCase;
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.net.URL;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,8 +32,8 @@
 import org.apache.mina.util.AvailablePortFinder;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Expand;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.Service;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.Service;
 
 
 /**
@@ -46,7 +45,7 @@
  * directory.
  *
  * Generally one can create a src/test/resource directory for a project and
- * point the org.safehaus.triplesec.unit.resource.dir property to the absolute
+ * point the org.apache.directory.triplesec.unit.resource.dir property to the absolute
  * path for this directory.  Absolute paths must be used, however with Maven
  * the ${basedir} macro can be used in the project.properties file to set this
  * path in a position independent fashion.  Within an IDE the test run must
@@ -69,11 +68,11 @@
 public class TriplesecIntegration extends TestCase
 {
     /** the resources property to set */
-    public static final String RESOURCES_DIRECTORY = "org.safehaus.triplesec.integration.resourcesDirectory";
+    public static final String RESOURCES_DIRECTORY = "org.apache.directory.triplesec.integration.resourcesDirectory";
     /** a comma delimited list of web applications */
-    public static final String WEBAPPS_PROPERTY = "org.safehaus.triplesec.integration.webapps";
+    public static final String WEBAPPS_PROPERTY = "org.apache.directory.triplesec.integration.webapps";
     /** the base property for a the path to a webapp war */
-    public static final String WEBAPPWARBASE_PROPERTY = "org.safehaus.triplesec.integration.webappWarBase";
+    public static final String WEBAPPWARBASE_PROPERTY = "org.apache.directory.triplesec.integration.webappWarBase";
     /** the SLF4J logger for this class */
     private static final Logger log = LoggerFactory.getLogger( TriplesecIntegration.class );
 

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

Modified: directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif (original)
+++ directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.ldif Fri Aug 10 00:58:38 2007
@@ -358,7 +358,7 @@
 objectClass: policyPermission
 objectClass: javaPermission
 permName: mockPerm0
-permJavaClass: org.safehaus.triplesec.guardian.StringPermission
+permJavaClass: org.apache.directory.triplesec.guardian.StringPermission
 permJavaName: mockPerm0
 
 dn: permName=mockPerm1,ou=permissions,appName=mockContext,appName=mockApplication,ou=applications,dc=example,dc=com

Modified: directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml Fri Aug 10 00:58:38 2007
@@ -479,8 +479,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>
@@ -504,12 +504,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>
@@ -543,7 +543,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>
@@ -551,7 +551,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>
@@ -560,7 +560,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>
              <property name="smtpHost"><value>localhost</value></property>
              <property name="smtpSubject"><value>Triplesec Account Activated</value></property>
@@ -585,7 +585,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>
 - ->
@@ -668,7 +668,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>

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

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountDisabledException.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;
 
 import org.safehaus.otp.HotpErrorConstants;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/AccountLockedOutException.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;
 
 
 import org.safehaus.otp.HotpErrorConstants;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/BaseKerberosLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/BaseKerberosLoginModuleWrapper.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/BaseKerberosLoginModuleWrapper.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/BaseKerberosLoginModuleWrapper.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
@@ -26,7 +26,7 @@
 import org.safehaus.otp.HotpErrorConstants;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class BaseKerberosLoginModuleWrapper
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/HotpLoginException.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;
 
 
 import org.safehaus.otp.HotpErrorConstants;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos1FactorLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos1FactorLoginModuleWrapper.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos1FactorLoginModuleWrapper.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos1FactorLoginModuleWrapper.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.HashMap;
 import java.util.Map;
@@ -28,11 +28,10 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class Kerberos1FactorLoginModuleWrapper extends BaseKerberosLoginModuleWrapper implements LoginModule
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos2FactorLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos2FactorLoginModuleWrapper.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos2FactorLoginModuleWrapper.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/Kerberos2FactorLoginModuleWrapper.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;
@@ -34,7 +34,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class Kerberos2FactorLoginModuleWrapper extends BaseKerberosLoginModuleWrapper implements LoginModule
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/LdapBindLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/LdapBindLoginModule.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/LdapBindLoginModule.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/LdapBindLoginModule.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;
 import java.util.Hashtable;
@@ -40,7 +40,7 @@
 import javax.security.auth.spi.LoginModule;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class LdapBindLoginModule implements LoginModule
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/OldSafehausLoginModule.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;
 
 
 import java.util.Map;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PasscodeCallback.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;
 
 
 import javax.security.auth.callback.Callback;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PolicyCallback.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 
 import javax.security.auth.callback.Callback;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/PreauthFailedException.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;
 
 
 import org.safehaus.otp.HotpErrorConstants;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/RealmCallback.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;
 
 
 import javax.security.auth.callback.Callback;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchInProgressException.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;
 
 
 import org.safehaus.otp.HotpErrorConstants;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/ResynchStartingException.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;
 
 
 import org.safehaus.otp.HotpErrorConstants;

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/SafehausLoginModule.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;
 
 
 import java.util.HashMap;
@@ -37,8 +37,8 @@
 import javax.security.auth.callback.PasswordCallback;
 
 import org.safehaus.otp.HotpErrorConstants;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.Profile;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipal.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipal.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipal.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/src/main/java/org/apache/directory/triplesec/jaas/TriplesecRealmPrincipal.java Fri Aug 10 00:58:38 2007
@@ -18,15 +18,15 @@
  */
 
 
-package org.safehaus.triplesec.jaas;
+package org.apache.directory.triplesec.jaas;
 
 import java.security.Principal;
 
-import org.safehaus.triplesec.guardian.RealmPolicy;
-import org.safehaus.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.RealmPolicy;
+import org.apache.directory.triplesec.guardian.Profile;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class TriplesecRealmPrincipal implements Principal
 {