svn commit: r491261 [2/8] - in /directory/sandbox/triplesec-jacc: ./ admin-api/ admin-api/src/main/java/org/apache/ admin-api/src/main/java/org/apache/directory/ admin-api/src/main/java/org/apache/directory/triplesec/ admin-api/src/main/java/org/apache...

[dj...@apache.org]

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/EntryAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/EntryAlreadyExistsException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/EntryAlreadyExistsException.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/EntryAlreadyExistsException.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUser.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUser.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUser.java Sat Dec 30 10:00:46 2006
@@ -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.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
 
 
 public class ExternalUser extends User

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUserModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUserModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUserModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ExternalUserModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,7 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
 
 
 public class ExternalUserModifier implements Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Group.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Group.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Group.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Group.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collections;
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.safehaus.triplesec.admin.dao.GroupDao;
+import org.apache.directory.triplesec.admin.dao.GroupDao;
 
 
 public class Group extends AdministeredEntity

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/GroupModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/GroupModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/GroupModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/GroupModifier.java Sat Dec 30 10:00:46 2006
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Set;
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.GroupDao;
+import org.apache.directory.triplesec.admin.dao.GroupDao;
 
 
 public class GroupModifier implements Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUser.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUser.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUser.java Sat Dec 30 10:00:46 2006
@@ -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.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.dao.HauskeysUserDao;
 
 
 public class HauskeysUser extends User

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUserModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUserModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUserModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/HauskeysUserModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.ArrayList;
@@ -27,7 +27,7 @@
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.dao.HauskeysUserDao;
 
 
 public class HauskeysUserModifier implements Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUser.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUser.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUser.java Sat Dec 30 10:00:46 2006
@@ -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.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.dao.LocalUserDao;
 
 
 public class LocalUser extends User

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUserModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUserModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUserModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/LocalUserModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,7 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.dao.LocalUserDao;
 
 
 public class LocalUserModifier implements Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ModificationLossException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ModificationLossException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ModificationLossException.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ModificationLossException.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/MultiValuedField.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/MultiValuedField.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/MultiValuedField.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/MultiValuedField.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collections;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/NoSuchEntryException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/NoSuchEntryException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/NoSuchEntryException.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/NoSuchEntryException.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionActions.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionActions.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionActions.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionActions.java Sat Dec 30 10:00:46 2006
@@ -18,17 +18,17 @@
  */
 
 
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 import java.util.Set;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Date;
 
-import org.safehaus.triplesec.admin.dao.PermissionActionsDao;
+import org.apache.directory.triplesec.admin.dao.PermissionActionsDao;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PermissionActions extends AdministeredEntity implements Constants {
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionClass.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionClass.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionClass.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionClass.java Sat Dec 30 10:00:46 2006
@@ -18,15 +18,15 @@
  */
 
 
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 import java.util.Set;
 import java.util.Date;
 
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PermissionClass extends AdministeredEntity {
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionDeniedException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionDeniedException.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionDeniedException.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/PermissionDeniedException.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Profile.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Profile.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Profile.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collections;
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.safehaus.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
 
 
 public class Profile extends AdministeredEntity

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ProfileModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ProfileModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ProfileModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ProfileModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.ArrayList;
@@ -26,7 +26,7 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
 
 
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ReadOnlyIterator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ReadOnlyIterator.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ReadOnlyIterator.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/ReadOnlyIterator.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Role.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Role.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Role.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/Role.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Collections;
@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.safehaus.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
 
 
 public class Role extends AdministeredEntity

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/RoleModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/RoleModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/RoleModifier.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/RoleModifier.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.ArrayList;
@@ -26,7 +26,7 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
 
 
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/SingleValuedField.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/SingleValuedField.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/SingleValuedField.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/SingleValuedField.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import javax.naming.directory.BasicAttribute;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/TriplesecAdmin.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.HashSet;
@@ -25,16 +25,16 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.safehaus.triplesec.admin.dao.ApplicationDao;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ExternalUserDao;
-import org.safehaus.triplesec.admin.dao.GroupDao;
-import org.safehaus.triplesec.admin.dao.HauskeysUserDao;
-import org.safehaus.triplesec.admin.dao.LocalUserDao;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
-import org.safehaus.triplesec.admin.dao.ProfileDao;
-import org.safehaus.triplesec.admin.dao.RoleDao;
-import org.safehaus.triplesec.admin.dao.UserDao;
+import org.apache.directory.triplesec.admin.dao.ApplicationDao;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.dao.GroupDao;
+import org.apache.directory.triplesec.admin.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.dao.UserDao;
 
  
 public class TriplesecAdmin

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/User.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/User.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/User.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/User.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.Date;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ApplicationDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ApplicationDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ApplicationDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ApplicationDao.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Iterator;
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
 
 
 public interface ApplicationDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/DaoFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/DaoFactory.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/DaoFactory.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/DaoFactory.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Properties;
 
-import org.safehaus.triplesec.admin.ConfigurationException;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ConfigurationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ExternalUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ExternalUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ExternalUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ExternalUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -25,8 +25,8 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ExternalUser;
 
 
 public interface ExternalUserDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/GroupDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/GroupDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/GroupDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/GroupDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -26,8 +26,8 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Group;
 
 
 public interface GroupDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/HauskeysUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/HauskeysUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/HauskeysUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/HauskeysUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -25,8 +25,8 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.HauskeysUser;
 
 
 public interface HauskeysUserDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/LocalUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/LocalUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/LocalUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/LocalUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -25,8 +25,8 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.LocalUser;
 
 
 public interface LocalUserDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionActionsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionActionsDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionActionsDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionActionsDao.java Sat Dec 30 10:00:46 2006
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -26,11 +26,11 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.PermissionActions;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.PermissionActions;
+import org.apache.directory.triplesec.admin.DataAccessException;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public interface PermissionActionsDao {
     Iterator<PermissionActions> permissionActionsIterator( String contextDn, boolean isGrant ) throws DataAccessException;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionClassDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionClassDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionClassDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/PermissionClassDao.java Sat Dec 30 10:00:46 2006
@@ -17,16 +17,16 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.PermissionActions;
-import org.safehaus.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.PermissionActions;
+import org.apache.directory.triplesec.admin.PermissionClass;
 
 
 public interface PermissionClassDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ProfileDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ProfileDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ProfileDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ProfileDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -26,9 +26,9 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.PermissionClass;
 
 
 public interface ProfileDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/RoleDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/RoleDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/RoleDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/RoleDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Date;
@@ -26,9 +26,9 @@
 
 import javax.naming.directory.ModificationItem;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.PermissionClass;
 
 
 public interface RoleDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/UserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/UserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/UserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/UserDao.java Sat Dec 30 10:00:46 2006
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao;
+package org.apache.directory.triplesec.admin.dao;
 
 
 import java.util.Iterator;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.User;
 
 
 public interface UserDao

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/AbstractLdapDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/AbstractLdapDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/AbstractLdapDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/AbstractLdapDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import javax.naming.Context;
@@ -26,8 +26,8 @@
 
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.DataAccessException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/JndiIterator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/JndiIterator.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/JndiIterator.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/JndiIterator.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Iterator;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapApplicationDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapApplicationDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapApplicationDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapApplicationDao.java Sat Dec 30 10:00:46 2006
@@ -17,19 +17,19 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.dao.ApplicationDao;
-import org.safehaus.triplesec.admin.dao.ProfileDao;
-import org.safehaus.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.dao.ApplicationDao;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import javax.naming.directory.Attributes;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDaoFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDaoFactory.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDaoFactory.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapDaoFactory.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Properties;
@@ -26,18 +26,18 @@
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.InitialLdapContext;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.dao.ApplicationDao;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ExternalUserDao;
-import org.safehaus.triplesec.admin.dao.GroupDao;
-import org.safehaus.triplesec.admin.dao.HauskeysUserDao;
-import org.safehaus.triplesec.admin.dao.LocalUserDao;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
-import org.safehaus.triplesec.admin.dao.ProfileDao;
-import org.safehaus.triplesec.admin.dao.RoleDao;
-import org.safehaus.triplesec.admin.dao.UserDao;
-import org.safehaus.triplesec.admin.dao.PermissionActionsDao;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.dao.ApplicationDao;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.dao.GroupDao;
+import org.apache.directory.triplesec.admin.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.dao.UserDao;
+import org.apache.directory.triplesec.admin.dao.PermissionActionsDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Date;
@@ -34,14 +34,14 @@
 import javax.naming.directory.SchemaViolationException;
 import javax.naming.directory.SearchControls;
 
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionDeniedException;
-import org.safehaus.triplesec.admin.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
 
 
 public class LdapExternalUserDao extends AbstractLdapDao implements ExternalUserDao, Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Date;
@@ -39,13 +39,13 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.dao.GroupDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.dao.GroupDao;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.io.UnsupportedEncodingException;
@@ -42,14 +42,14 @@
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionDeniedException;
-import org.safehaus.triplesec.admin.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
+import org.apache.directory.triplesec.admin.dao.HauskeysUserDao;
 
 
 public class LdapHauskeysUserDao extends AbstractLdapDao implements HauskeysUserDao, Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Date;
@@ -40,14 +40,14 @@
 
 import org.apache.directory.shared.ldap.util.StringTools;
 
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionDeniedException;
-import org.safehaus.triplesec.admin.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
+import org.apache.directory.triplesec.admin.dao.LocalUserDao;
 
 
 public class LdapLocalUserDao extends AbstractLdapDao implements LocalUserDao, Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionActionsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionActionsDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionActionsDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionActionsDao.java Sat Dec 30 10:00:46 2006
@@ -18,7 +18,7 @@
  */
 
 
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 import java.util.Collections;
 import java.util.Date;
@@ -40,13 +40,13 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionActions;
-import org.safehaus.triplesec.admin.dao.PermissionActionsDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionActions;
+import org.apache.directory.triplesec.admin.dao.PermissionActionsDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionClassDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionClassDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionClassDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionClassDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Date;
@@ -36,15 +36,15 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionClass;
-import org.safehaus.triplesec.admin.PermissionActions;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
-import org.safehaus.triplesec.admin.dao.PermissionActionsDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.PermissionActions;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.dao.PermissionActionsDao;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.io.UnsupportedEncodingException;
@@ -41,15 +41,15 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.PermissionClass;
-import org.safehaus.triplesec.admin.dao.ProfileDao;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.dao.ProfileDao;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Collections;
@@ -38,15 +38,15 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.name.LdapDN;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.ConstraintViolationException;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.EntryAlreadyExistsException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionClass;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.dao.RoleDao;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.ConstraintViolationException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionClass;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.util.Iterator;
@@ -34,12 +34,12 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
-import org.safehaus.triplesec.admin.Constants;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.admin.PermissionDeniedException;
-import org.safehaus.triplesec.admin.User;
-import org.safehaus.triplesec.admin.dao.UserDao;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
+import org.apache.directory.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.dao.UserDao;
 
 
 public class LdapUserDao extends AbstractLdapDao implements UserDao, Constants

Modified: directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.dao.ldap;
+package org.apache.directory.triplesec.admin.dao.ldap;
 
 
 import java.io.UnsupportedEncodingException;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
 import java.util.HashSet;

Modified: directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java (original)
+++ directory/sandbox/triplesec-jacc/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java Sat Dec 30 10:00:46 2006
@@ -17,13 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
 
 
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
-import java.util.Set;
 
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
@@ -32,11 +30,11 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.shared.ldap.util.StringTools;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.PermissionClassDao;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapPermissionClassDao;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.PermissionClassDao;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapPermissionClassDao;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 

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

Modified: directory/sandbox/triplesec-jacc/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/changelog/pom.xml Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java Sat Dec 30 10:00:46 2006
@@ -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;
@@ -44,14 +44,14 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
-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.StringAttribute;
-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.StringAttribute;
+import org.apache.directory.triplesec.changelog.beta.support.AttributeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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.Date;
@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.safehaus.triplesec.changelog.beta.support.AttributeModificationType;
-import org.safehaus.triplesec.changelog.beta.support.ChangeEventType;
+import org.apache.directory.triplesec.changelog.beta.support.AttributeModificationType;
+import org.apache.directory.triplesec.changelog.beta.support.ChangeEventType;
 
 /**
  * @author <a href="mailto:ersiner@safehaus.org">Ersin Er</a>

Modified: directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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 ersin
@@ -60,7 +60,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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java Sat Dec 30 10:00:46 2006
@@ -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 ersin
@@ -60,7 +60,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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java Sat Dec 30 10:00:46 2006
@@ -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.core.schema.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/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java (original)
+++ directory/sandbox/triplesec-jacc/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java Sat Dec 30 10:00:46 2006
@@ -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