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 [2/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/admin-api2/src/main/java/org/apache/directory/triplesec/admin/AdministeredEntity.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/AdministeredEntity.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/AdministeredEntity.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/AdministeredEntity.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Date;
 
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
 
 
 public abstract class AdministeredEntity

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Application.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Application.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Application.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Application.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collection;
@@ -26,13 +26,13 @@
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.SearchControls;
 
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
-import org.safehaus.triplesec.admin.persistence.StateManager;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.ChildMap;
-import org.safehaus.triplesec.admin.persistence.HiddenChild;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.ChildMap;
+import org.apache.directory.triplesec.admin.persistence.HiddenChild;
 
 
 public class Application implements PersistenceCapable

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

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Group.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Group.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Group.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Group.java Fri Aug 10 00:58:38 2007
@@ -17,19 +17,18 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collection;
-import java.util.Set;
 
 import javax.naming.directory.Attributes;
 
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
-import org.safehaus.triplesec.admin.persistence.ReferenceMapField;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.ReferenceMapField;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
 
 
 public class Group implements PersistenceCapable

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Permission.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Permission.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Permission.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Permission.java Fri Aug 10 00:58:38 2007
@@ -17,18 +17,18 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.BasicAttribute;
 
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
-import org.safehaus.triplesec.admin.persistence.StateManager;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
 
 
 public class Permission implements PersistenceCapable

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Profile.java Fri Aug 10 00:58:38 2007
@@ -17,22 +17,20 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
-import java.util.Set;
 import java.util.Collection;
 
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
-import org.safehaus.triplesec.admin.persistence.StateManager;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
-import org.safehaus.triplesec.admin.persistence.MultiValuedField;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.ReferenceMapField;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.ReferenceMapField;
 
 
 public class Profile implements PersistenceCapable

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Role.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Role.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Role.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/Role.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collection;
@@ -25,13 +25,12 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import org.safehaus.triplesec.admin.persistence.StateManager;
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.ReferenceMapField;
-import org.safehaus.triplesec.admin.persistence.ChildMap;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.ReferenceMapField;
 
 
 public class Role implements PersistenceCapable

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.HashMap;
@@ -31,10 +31,10 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
-import org.safehaus.triplesec.admin.persistence.EntityManager;
-import org.safehaus.triplesec.admin.persistence.EntityManagerImpl;
-import org.safehaus.triplesec.admin.persistence.PCException;
-import org.safehaus.triplesec.admin.persistence.Query;
+import org.apache.directory.triplesec.admin.persistence.EntityManager;
+import org.apache.directory.triplesec.admin.persistence.EntityManagerImpl;
+import org.apache.directory.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.persistence.Query;
 
 
 public class TriplesecAdmin

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/User.java Fri Aug 10 00:58:38 2007
@@ -17,17 +17,17 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import org.safehaus.triplesec.admin.persistence.PersistenceCapable;
-import org.safehaus.triplesec.admin.persistence.SimpleRdn;
-import org.safehaus.triplesec.admin.persistence.SingleValuedField;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.admin.persistence.StateManager;
+import org.apache.directory.triplesec.admin.persistence.PersistenceCapable;
+import org.apache.directory.triplesec.admin.persistence.SimpleRdn;
+import org.apache.directory.triplesec.admin.persistence.SingleValuedField;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.StateManager;
 
 
 public class User implements PersistenceCapable

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChangeListener.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChangeListener.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChangeListener.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChangeListener.java Fri Aug 10 00:58:38 2007
@@ -18,10 +18,10 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface ChangeListener<T extends PersistenceCapable>
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChildMap.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChildMap.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChildMap.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ChildMap.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import java.util.Map;
 import java.util.Set;
@@ -33,7 +33,7 @@
 import javax.naming.NamingException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ChildMap<T extends PersistenceCapable> implements Map<String, T>, ChangeListener<T>
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ConstantRdn.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ConstantRdn.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ConstantRdn.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ConstantRdn.java Fri Aug 10 00:58:38 2007
@@ -18,13 +18,13 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.Attribute;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ConstantRdn implements Rdn
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManager.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 /**
  * @version $Rev$ $Date$

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManagerImpl.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManagerImpl.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/EntityManagerImpl.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Field.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Field.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Field.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Field.java Fri Aug 10 00:58:38 2007
@@ -18,13 +18,13 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.Attribute;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface Field
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/HiddenChild.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/HiddenChild.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/HiddenChild.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/HiddenChild.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import javax.naming.directory.DirContext;
 import javax.naming.directory.Attributes;
@@ -26,7 +26,7 @@
 import javax.naming.NamingException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class HiddenChild
 {

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/PersistenceCapable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/PersistenceCapable.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/PersistenceCapable.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/PersistenceCapable.java Fri Aug 10 00:58:38 2007
@@ -18,12 +18,12 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import javax.naming.directory.Attributes;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface PersistenceCapable<T extends PersistenceCapable>
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Query.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Query.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Query.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Query.java Fri Aug 10 00:58:38 2007
@@ -18,9 +18,8 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
-import java.util.Collection;
 import java.util.Map;
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/QueryImpl.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/QueryImpl.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/QueryImpl.java Fri Aug 10 00:58:38 2007
@@ -18,15 +18,13 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
-import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Collections;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;
-import java.lang.reflect.*;
 
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.DirContext;

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Rdn.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Rdn.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Rdn.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/Rdn.java Fri Aug 10 00:58:38 2007
@@ -18,10 +18,10 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface Rdn extends Field
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ReferenceMapField.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ReferenceMapField.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ReferenceMapField.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/ReferenceMapField.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import java.util.Collections;
 import java.util.HashMap;

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SimpleRdn.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SimpleRdn.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SimpleRdn.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SimpleRdn.java Fri Aug 10 00:58:38 2007
@@ -18,10 +18,10 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class SimpleRdn extends SingleValuedField<String> implements Rdn
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SingleValuedField.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SingleValuedField.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SingleValuedField.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/SingleValuedField.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 
 import javax.naming.directory.BasicAttribute;
@@ -26,7 +26,7 @@
 import javax.naming.directory.Attribute;
 import javax.naming.NamingException;
 
-import org.safehaus.triplesec.admin.persistence.Field;
+import org.apache.directory.triplesec.admin.persistence.Field;
 
 
 public class SingleValuedField<T> implements Field

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

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/StateManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/StateManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/StateManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/main/java/org/apache/directory/triplesec/admin/persistence/StateManager.java Fri Aug 10 00:58:38 2007
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.persistence;
+package org.apache.directory.triplesec.admin.persistence;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
-import java.util.HashSet;
-import java.util.Set;
-
 import junit.framework.TestCase;
-import org.safehaus.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.admin.persistence.State;
 
 
 public class EntryModifierTest extends TestCase

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Properties;
@@ -28,11 +28,11 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.shared.ldap.util.StringTools;
-import org.safehaus.triplesec.admin.persistence.EntityManager;
-import org.safehaus.triplesec.admin.persistence.EntityManagerImpl;
-import org.safehaus.triplesec.admin.persistence.PCException;
-import org.safehaus.triplesec.admin.persistence.State;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.admin.persistence.EntityManager;
+import org.apache.directory.triplesec.admin.persistence.EntityManagerImpl;
+import org.apache.directory.triplesec.admin.persistence.PCException;
+import org.apache.directory.triplesec.admin.persistence.State;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 /**
@@ -103,7 +103,7 @@
         //test load
         Permission perm0 = entityManager.find( Permission.class, app, "permName=mockPerm0,ou=permissions" );
         assertNotNull( perm0 );
-        assertEquals( "org.safehaus.triplesec.guardian.StringPermission", perm0.getJavaClass() );
+        assertEquals( "org.apache.directory.triplesec.guardian.StringPermission", perm0.getJavaClass() );
         assertEquals( "mockPerm0", perm0.getJavaName() );
         assertEquals( null, perm0.getJavaActions() );
         assertEquals( State.CLEAN, perm0.getStateManager().getState() );
@@ -117,13 +117,13 @@
         //see if change was saved by reloading
         Permission perm0a = entityManager.find( Permission.class, app, "permName=mockPerm0,ou=permissions" );
         assertNotNull( perm0a );
-        assertEquals( "org.safehaus.triplesec.guardian.StringPermission", perm0a.getJavaClass() );
+        assertEquals( "org.apache.directory.triplesec.guardian.StringPermission", perm0a.getJavaClass() );
         assertEquals( "foo", perm0a.getJavaName() );
         assertEquals( null, perm0a.getJavaActions() );
         assertEquals( State.CLEAN, perm0a.getStateManager().getState() );
 
         //make a new permission
-        Permission perm1 = new Permission( "testPerm", "description", "org.safehaus.triplesec.guardian.StringPermission", "testPerm", null );
+        Permission perm1 = new Permission( "testPerm", "description", "org.apache.directory.triplesec.guardian.StringPermission", "testPerm", null );
         assertEquals( State.EMPTY, perm1.getStateManager().getState() );
         entityManager.persist( perm1, app );
         assertEquals( State.NEW, perm1.getStateManager().getState() );
@@ -133,7 +133,7 @@
         //see if we can load it
         Permission perm1a = entityManager.find( Permission.class, app, "permName=testPerm,ou=permissions" );
         assertNotNull( perm1a );
-        assertEquals( "org.safehaus.triplesec.guardian.StringPermission", perm1a.getJavaClass() );
+        assertEquals( "org.apache.directory.triplesec.guardian.StringPermission", perm1a.getJavaClass() );
         assertEquals( "testPerm", perm1a.getJavaName() );
         assertEquals( null, perm1a.getJavaActions() );
         assertEquals( State.CLEAN, perm1a.getStateManager().getState() );
@@ -154,7 +154,7 @@
         }
 
         //make a new permission over again
-        Permission perm1b = new Permission( "testPerm", "description", "org.safehaus.triplesec.guardian.StringPermission", "testPerm", null );
+        Permission perm1b = new Permission( "testPerm", "description", "org.apache.directory.triplesec.guardian.StringPermission", "testPerm", null );
         assertEquals( State.EMPTY, perm1b.getStateManager().getState() );
         entityManager.persist( perm1b, app );
         assertEquals( State.NEW, perm1b.getStateManager().getState() );
@@ -168,7 +168,7 @@
         //try to find it
         Permission perm1c = entityManager.find( Permission.class, app, "permName=foo,ou=permissions" );
         assertNotNull( perm1c );
-        assertEquals( "org.safehaus.triplesec.guardian.StringPermission", perm1c.getJavaClass() );
+        assertEquals( "org.apache.directory.triplesec.guardian.StringPermission", perm1c.getJavaClass() );
         assertEquals( "foo", perm1c.getPermissionId() );
         assertEquals( null, perm1c.getJavaActions() );
         assertEquals( State.CLEAN, perm1c.getStateManager().getState() );

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/pom.xml Fri Aug 10 00:58:38 2007
@@ -57,7 +57,7 @@
             <configuration>
               <tasks>
                 <java fork="true"
-                      classname="org.safehaus.triplesec.changelog.LdapChangeLogApplication">
+                      classname="org.apache.directory.triplesec.changelog.LdapChangeLogApplication">
                   <classpath>
                     <path refid="maven.compile.classpath"/>
                     <path refid="maven.test.classpath"/>

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.interceptor;
+package org.apache.directory.triplesec.changelog.beta.interceptor;
 
 
 import java.sql.Connection;
@@ -45,14 +45,14 @@
 import org.apache.directory.server.core.jndi.ServerContext;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.DateUtils;
-import org.safehaus.triplesec.changelog.beta.model.AddChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.ChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.DeleteChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.ModifyChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.ModifyDnChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.ModifyRdnChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.MoveAndRenameChangeEvent;
-import org.safehaus.triplesec.changelog.beta.support.AttributeUtils;
+import org.apache.directory.triplesec.changelog.beta.model.AddChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.ChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.DeleteChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.ModifyChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.ModifyDnChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.ModifyRdnChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.MoveAndRenameChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.support.AttributeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
  * @author <a href="mailto:ersiner@safehaus.org">Ersin Er</a>

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.Date;
 
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
- * A base implementation for {@link org.safehaus.triplesec.changelog.beta.model.ChangeEvent}
+ * A base implementation for {@link org.apache.directory.triplesec.changelog.beta.model.ChangeEvent}
  * 
  * @author <a href="mailto:ersiner@safehaus.org">Ersin Er</a>
  * @author <a href="mailto:akarasulu@safehaus.org">Alex Karasulu</a>
@@ -49,7 +49,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.ChangeEvent#getEventMessage()
+     * @see org.apache.directory.triplesec.changelog.model.ChangeEvent#getEventMessage()
      */
     public String getEventMessage()
     {
@@ -58,7 +58,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.ChangeEvent#getEventTime()
+     * @see org.apache.directory.triplesec.changelog.model.ChangeEvent#getEventTime()
      */
     public Date getEventTime()
     {
@@ -67,7 +67,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.ChangeEvent#getEventType()
+     * @see org.apache.directory.triplesec.changelog.model.ChangeEvent#getEventType()
      */
     public int getEventType()
     {
@@ -76,7 +76,7 @@
     
     
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.ChangeEvent#getNameOfAffectedEntry()
+     * @see org.apache.directory.triplesec.changelog.model.ChangeEvent#getNameOfAffectedEntry()
      */
     public String getAffectedEntryName()
     {
@@ -85,7 +85,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.ChangeEvent#getPrincipleName()
+     * @see org.apache.directory.triplesec.changelog.model.ChangeEvent#getPrincipleName()
      */
     public String getPrincipalName()
     {

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

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.Date;
 
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
  * @author <a href="mailto:ersiner@safehaus.org">Ersin Er</a>

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,19 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.changelog.beta.support.AttributeModificationType;
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
  * @author <a href="mailto:ersiner@safehaus.org">Ersin Er</a>

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.Date;
 
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
 
 /**
@@ -50,7 +50,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
+     * @see org.apache.directory.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
      */
     public String getEventMessage()
     {

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.Date;
 
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
-import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 
 /**
@@ -62,7 +61,7 @@
 
 
     /* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
+     * @see org.apache.directory.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
      */
     public String getEventMessage()
     {

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/MoveAndRenameChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/MoveAndRenameChangeEvent.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/MoveAndRenameChangeEvent.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/MoveAndRenameChangeEvent.java Fri Aug 10 00:58:38 2007
@@ -18,12 +18,12 @@
  */
 
 
-package org.safehaus.triplesec.changelog.beta.model;
+package org.apache.directory.triplesec.changelog.beta.model;
 
 import java.util.Date;
 
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
  * @author ersin
@@ -61,7 +61,7 @@
     public boolean isDeleteOldDn() {
         return deleteOldDn;
     }/* (non-Javadoc)
-     * @see org.safehaus.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
+     * @see org.apache.directory.triplesec.changelog.model.BaseChangeEvent#getEventMessage()
      */
     public String getEventMessage()
     {

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.support;
+package org.apache.directory.triplesec.changelog.beta.support;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.util.Base64;
-import org.safehaus.triplesec.changelog.beta.model.StringAttribute;
+import org.apache.directory.triplesec.changelog.beta.model.StringAttribute;
 
 public class AttributeUtils
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelog.beta.support;
+package org.apache.directory.triplesec.changelog.beta.support;
 
 /**
  * An enumaration type for representing the actual type of a 

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.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 java.io.File;
@@ -116,7 +116,7 @@
         Element bean = beansElement.addElement( "bean" );
         bean.addAttribute( "id", "configuration" );
         bean.addAttribute( "class", 
-            "org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration" );
+            "org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration" );
         
         if ( configuration.getPresentationBaseUrl() != null )
         {

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.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 java.io.File;
@@ -68,8 +68,8 @@
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
-import org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -288,8 +288,8 @@
         props.put( "java.naming.security.principal", "uid=admin,ou=system" );
         props.put( "java.naming.security.credentials", "secret" );
         props.put( "java.naming.provider.url", "dc=example,dc=com" );
-        props.put( "java.naming.factory.state", "org.safehaus.triplesec.store.ProfileStateFactory" );
-        props.put( "java.naming.factory.object", "org.safehaus.triplesec.store.ProfileObjectFactory" );
+        props.put( "java.naming.factory.state", "org.apache.directory.triplesec.store.ProfileStateFactory" );
+        props.put( "java.naming.factory.object", "org.apache.directory.triplesec.store.ProfileObjectFactory" );
         props.put( "kdc.primary.realm", "EXAMPLE.COM" );
         props.put( "kdc.principal", "krbtgt/EXAMPLE.COM@EXAMPLE.COM" );
         props.put( "kdc.encryption.types", "des-cbc-md5 des3-cbc-sha1 des3-cbc-md5 des-cbc-md4 des-cbc-crc" );
@@ -309,7 +309,7 @@
         props.put( "kdc.tgs.renewable.allowed", "true" );
         props.put( "safehaus.entry.basedn", "ou=Users,dc=example,dc=com" );
         props.put( "safehaus.load.testdata", "true" );
-        props.put( "kerberos.sam.type.7", "org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier" );
+        props.put( "kerberos.sam.type.7", "org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier" );
         ServerXmlUtils.writeConfiguration( outputFile, configuration, props );
     }
     

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.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 java.io.File;
@@ -25,7 +25,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.net.UnknownHostException;
 
 import org.apache.commons.io.FileUtils;
 import org.dom4j.Document;

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.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/testAddInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.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/testAddServletInitParameterValue.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValue.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValue.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValue.xml Fri Aug 10 00:58:38 2007
@@ -8,7 +8,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>
     <init-param>
       <param-name>newInitParameter</param-name>

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValueInitial.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValueInitial.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValueInitial.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValueInitial.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>
   </servlet>
   <servlet-mapping>

Modified: directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.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>