You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ck...@apache.org on 2007/07/23 15:50:20 UTC
svn commit: r558727 [2/2] - in /directory/triplesec/trunk:
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/directory/triplesec/...
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapExternalUserDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapExternalUserDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapExternalUserDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapExternalUserDao.java Mon Jul 23 06:50:14 2007
@@ -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.EntryAlreadyExistsException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.dao.ExternalUserDao;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
public class LdapExternalUserDao extends AbstractLdapDao implements ExternalUserDao, Constants
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapGroupDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapGroupDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapGroupDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapGroupDao.java Mon Jul 23 06:50:14 2007
@@ -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.dao.GroupDao;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapHauskeysUserDao.java Mon Jul 23 06:50:14 2007
@@ -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.dao.HauskeysUserDao;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
public class LdapHauskeysUserDao extends AbstractLdapDao implements HauskeysUserDao, Constants
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapLocalUserDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapLocalUserDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapLocalUserDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapLocalUserDao.java Mon Jul 23 06:50:14 2007
@@ -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,15 +39,15 @@
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.shared.ldap.util.StringTools;
+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.dao.LocalUserDao;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.PermissionDeniedException;
-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;
public class LdapLocalUserDao extends AbstractLdapDao implements LocalUserDao, Constants
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapPermissionDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapPermissionDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapPermissionDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapPermissionDao.java Mon Jul 23 06:50:14 2007
@@ -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;
@@ -35,13 +35,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.Permission;
-import org.safehaus.triplesec.admin.dao.PermissionDao;
+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.Permission;
+import org.apache.directory.triplesec.admin.dao.PermissionDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapProfileDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapProfileDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapProfileDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapProfileDao.java Mon Jul 23 06:50:14 2007
@@ -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,13 +41,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.Profile;
-import org.safehaus.triplesec.admin.dao.ProfileDao;
+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.dao.ProfileDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapRoleDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapRoleDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapRoleDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapRoleDao.java Mon Jul 23 06:50:14 2007
@@ -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;
@@ -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.Role;
-import org.safehaus.triplesec.admin.dao.RoleDao;
+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.Role;
+import org.apache.directory.triplesec.admin.dao.RoleDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUserDao.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUserDao.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUserDao.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUserDao.java Mon Jul 23 06:50:14 2007
@@ -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
Copied: directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java (from r558676, directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUtils.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUtils.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/main/java/org/safehaus/triplesec/admin/dao/ldap/LdapUtils.java (original)
+++ directory/triplesec/trunk/admin-api/src/main/java/org/apache/directory/triplesec/admin/dao/ldap/LdapUtils.java Mon Jul 23 06:50:14 2007
@@ -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;
Copied: directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java (from r558676, directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/EntryModifierTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/EntryModifierTest.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/EntryModifierTest.java (original)
+++ directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/EntryModifierTest.java Mon Jul 23 06:50:14 2007
@@ -17,11 +17,20 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
import java.util.HashSet;
import java.util.Set;
+
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.PermissionModifier;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.ProfileModifier;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.RoleModifier;
import junit.framework.TestCase;
Copied: directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java (from r558676, directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/IntegrationTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java?view=diff&rev=558727&p1=directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/IntegrationTest.java&r1=558676&p2=directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/admin-api/src/test/java/org/safehaus/triplesec/admin/IntegrationTest.java (original)
+++ directory/triplesec/trunk/admin-api/src/test/java/org/apache/directory/triplesec/admin/IntegrationTest.java Mon Jul 23 06:50:14 2007
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.safehaus.triplesec.admin;
+package org.apache.directory.triplesec.admin;
import java.util.HashSet;
@@ -32,10 +32,27 @@
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.PermissionDao;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapPermissionDao;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Constants;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUserModifier;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.LocalUserModifier;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.PermissionModifier;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.PermissionDao;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapPermissionDao;
import org.safehaus.triplesec.integration.TriplesecIntegration;
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/interceptor/ChangelogService.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/interceptor/ChangelogService.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/interceptor/ChangelogService.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/interceptor/ChangelogService.java Mon Jul 23 06:50:14 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.shared.ldap.message.ModificationItemImpl;
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;
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/AddChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/AddChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/AddChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/AddChangeEvent.java Mon Jul 23 06:50:14 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>
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/BaseChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/BaseChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/BaseChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/BaseChangeEvent.java Mon Jul 23 06:50:14 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>
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ChangeEvent.java Mon Jul 23 06:50:14 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;
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/DeleteChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/DeleteChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/DeleteChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/DeleteChangeEvent.java Mon Jul 23 06:50:14 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>
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyChangeEvent.java Mon Jul 23 06:50:14 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.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>
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyDnChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyDnChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyDnChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyDnChangeEvent.java Mon Jul 23 06:50:14 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 ersin
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/ModifyRdnChangeEvent.java Mon Jul 23 06:50:14 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 ersin
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/StringAttribute.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/StringAttribute.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/model/StringAttribute.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/model/StringAttribute.java Mon Jul 23 06:50:14 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;
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeModificationType.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeModificationType.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeModificationType.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeModificationType.java Mon Jul 23 06:50:14 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;
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeUtils.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeUtils.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/AttributeUtils.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/AttributeUtils.java Mon Jul 23 06:50:14 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.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
{
Copied: directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java (from r558676, directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/ChangeEventType.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java?view=diff&rev=558727&p1=directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/ChangeEventType.java&r1=558676&p2=directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java&r2=558727
==============================================================================
--- directory/triplesec/trunk/changelog/src/main/java/org/safehaus/triplesec/changelog/beta/support/ChangeEventType.java (original)
+++ directory/triplesec/trunk/changelog/src/main/java/org/apache/directory/triplesec/changelog/beta/support/ChangeEventType.java Mon Jul 23 06:50:14 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/triplesec/trunk/swing-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/pom.xml?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/pom.xml (original)
+++ directory/triplesec/trunk/swing-admin/pom.xml Mon Jul 23 06:50:14 2007
@@ -91,7 +91,7 @@
<archive>
<manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>
<manifest>
- <mainClass>org.safehaus.triplesec.admin.swing.AdminFrame</mainClass>
+ <mainClass>org.apache.directory.triplesec.admin.swing.AdminFrame</mainClass>
</manifest>
</archive>
</configuration>
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminFrame.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminFrame.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminFrame.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminFrame.java Mon Jul 23 06:50:14 2007
@@ -44,13 +44,13 @@
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.User;
import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.User;
import org.safehaus.triplesec.guardian.ApplicationPolicy;
import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ApplicationPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ApplicationPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ApplicationPanel.java Mon Jul 23 06:50:14 2007
@@ -38,9 +38,10 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.ApplicationModifier;
-import org.safehaus.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.ApplicationModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+
import javax.swing.JPasswordField;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConnectionManager.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConnectionManager.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConnectionManager.java Mon Jul 23 06:50:14 2007
@@ -35,9 +35,9 @@
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
import org.safehaus.triplesec.configuration.TriplesecStartupConfiguration;
import org.safehaus.triplesec.guardian.ApplicationPolicy;
import org.safehaus.triplesec.guardian.Profile;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ExternalLinkPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ExternalLinkPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ExternalLinkPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ExternalLinkPanel.java Mon Jul 23 06:50:14 2007
@@ -33,8 +33,8 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.ExternalUserModifier;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUserModifier;
public class ExternalLinkPanel extends JPanel implements StatusObject, KeyListener, FocusListener
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GeneralPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GeneralPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GeneralPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GeneralPanel.java Mon Jul 23 06:50:14 2007
@@ -27,7 +27,7 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.AdministeredEntity;
+import org.apache.directory.triplesec.admin.AdministeredEntity;
public class GeneralPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupPanel.java Mon Jul 23 06:50:14 2007
@@ -39,9 +39,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
public class GroupPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupUsersPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupUsersPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/GroupUsersPanel.java Mon Jul 23 06:50:14 2007
@@ -35,7 +35,7 @@
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.User;
public class GroupUsersPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/HotpSettingsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/HotpSettingsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/HotpSettingsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/HotpSettingsPanel.java Mon Jul 23 06:50:14 2007
@@ -32,8 +32,8 @@
import javax.swing.JPasswordField;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
public class HotpSettingsPanel extends JPanel implements StatusObject, KeyListener, FocusListener
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeCellRenderer.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeCellRenderer.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeCellRenderer.java Mon Jul 23 06:50:14 2007
@@ -27,14 +27,14 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
/**
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeNavigation.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeNavigation.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeNavigation.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/LeftTreeNavigation.java Mon Jul 23 06:50:14 2007
@@ -28,9 +28,9 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewApplicationPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewApplicationPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewApplicationPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewApplicationPanel.java Mon Jul 23 06:50:14 2007
@@ -43,15 +43,16 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.ApplicationModifier;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.ProfileModifier;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.RoleModifier;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.ApplicationModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.ProfileModifier;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.RoleModifier;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+
import javax.swing.JPasswordField;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewGroupPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewGroupPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewGroupPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewGroupPanel.java Mon Jul 23 06:50:14 2007
@@ -43,10 +43,10 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.GroupModifier;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
public class NewGroupPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewPermissionPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewPermissionPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewPermissionPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewPermissionPanel.java Mon Jul 23 06:50:14 2007
@@ -41,10 +41,10 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.PermissionModifier;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.PermissionModifier;
public class NewPermissionPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewProfilePanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewProfilePanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewProfilePanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewProfilePanel.java Mon Jul 23 06:50:14 2007
@@ -44,11 +44,11 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.ProfileModifier;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.ProfileModifier;
+import org.apache.directory.triplesec.admin.User;
import javax.swing.JComboBox;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewRolePanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewRolePanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewRolePanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewRolePanel.java Mon Jul 23 06:50:14 2007
@@ -43,10 +43,10 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.RoleModifier;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.RoleModifier;
public class NewRolePanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewUserPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewUserPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewUserPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/NewUserPanel.java Mon Jul 23 06:50:14 2007
@@ -45,16 +45,15 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.ExternalUserModifier;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.LocalUserModifier;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.User;
-
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUserModifier;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.LocalUserModifier;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.User;
public class NewUserPanel extends JPanel implements StatusListener, StatusObject, KeyListener, FocusListener
{
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionDependentsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionDependentsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionDependentsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionDependentsPanel.java Mon Jul 23 06:50:14 2007
@@ -39,10 +39,10 @@
import javax.swing.table.AbstractTableModel;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
public class PermissionDependentsPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/PermissionPanel.java Mon Jul 23 06:50:14 2007
@@ -38,9 +38,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Permission;
-import org.safehaus.triplesec.admin.PermissionModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.PermissionModifier;
public class PermissionPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePanel.java Mon Jul 23 06:50:14 2007
@@ -42,10 +42,10 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.ProfileModifier;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.ProfileModifier;
+import org.apache.directory.triplesec.admin.User;
import javax.swing.JComboBox;
import javax.swing.JCheckBox;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePermissionsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePermissionsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePermissionsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfilePermissionsPanel.java Mon Jul 23 06:50:14 2007
@@ -35,7 +35,7 @@
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Permission;
public class ProfilePermissionsPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfileRolesPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfileRolesPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfileRolesPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProfileRolesPanel.java Mon Jul 23 06:50:14 2007
@@ -35,7 +35,7 @@
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.Role;
public class ProfileRolesPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProvisioningPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProvisioningPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProvisioningPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProvisioningPanel.java Mon Jul 23 06:50:14 2007
@@ -53,8 +53,8 @@
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
import com.sun.mail.smtp.SMTPTransport;
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleDependentsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleDependentsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleDependentsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleDependentsPanel.java Mon Jul 23 06:50:14 2007
@@ -39,9 +39,9 @@
import javax.swing.table.AbstractTableModel;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.Role;
public class RoleDependentsPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleGrantsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleGrantsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleGrantsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RoleGrantsPanel.java Mon Jul 23 06:50:14 2007
@@ -35,7 +35,7 @@
import javax.swing.JScrollPane;
import javax.swing.tree.DefaultMutableTreeNode;
-import org.safehaus.triplesec.admin.Permission;
+import org.apache.directory.triplesec.admin.Permission;
public class RoleGrantsPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RolePanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RolePanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RolePanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/RolePanel.java Mon Jul 23 06:50:14 2007
@@ -40,9 +40,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Role;
-import org.safehaus.triplesec.admin.RoleModifier;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Role;
+import org.apache.directory.triplesec.admin.RoleModifier;
public class RolePanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserDependentsPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserDependentsPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserDependentsPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserDependentsPanel.java Mon Jul 23 06:50:14 2007
@@ -42,11 +42,11 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.Group;
-import org.safehaus.triplesec.admin.GroupModifier;
-import org.safehaus.triplesec.admin.Profile;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.Group;
+import org.apache.directory.triplesec.admin.GroupModifier;
+import org.apache.directory.triplesec.admin.Profile;
+import org.apache.directory.triplesec.admin.User;
public class UserDependentsPanel extends JPanel
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserInfoPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserInfoPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserInfoPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserInfoPanel.java Mon Jul 23 06:50:14 2007
@@ -32,11 +32,11 @@
import javax.swing.JPasswordField;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.LocalUserModifier;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.LocalUserModifier;
+import org.apache.directory.triplesec.admin.User;
public class UserInfoPanel extends JPanel implements StatusObject, FocusListener, KeyListener
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserNorthPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserNorthPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserNorthPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserNorthPanel.java Mon Jul 23 06:50:14 2007
@@ -37,10 +37,10 @@
import javax.swing.JRadioButton;
import javax.swing.JTextField;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.User;
public class UserNorthPanel extends JPanel implements StatusObject, FocusListener, KeyListener
Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserPanel.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserPanel.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/UserPanel.java Mon Jul 23 06:50:14 2007
@@ -40,14 +40,15 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.ExternalUser;
-import org.safehaus.triplesec.admin.ExternalUserModifier;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.admin.LocalUser;
-import org.safehaus.triplesec.admin.LocalUserModifier;
-import org.safehaus.triplesec.admin.User;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.ExternalUser;
+import org.apache.directory.triplesec.admin.ExternalUserModifier;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.LocalUser;
+import org.apache.directory.triplesec.admin.LocalUserModifier;
+import org.apache.directory.triplesec.admin.User;
+
import javax.swing.JLabel;
import javax.swing.JCheckBox;
Modified: directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java (original)
+++ directory/triplesec/trunk/webapp-changelog/src/main/java/org/safehaus/triplesec/changelogui/ChangelogController.java Mon Jul 23 06:50:14 2007
@@ -31,8 +31,8 @@
import javax.faces.context.FacesContext;
-import org.safehaus.triplesec.changelog.beta.model.BaseChangeEvent;
-import org.safehaus.triplesec.changelog.beta.model.ChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.BaseChangeEvent;
+import org.apache.directory.triplesec.changelog.beta.model.ChangeEvent;
public class ChangelogController
{
Modified: directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java Mon Jul 23 06:50:14 2007
@@ -26,9 +26,9 @@
import wicket.protocol.http.WebApplication;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
import org.safehaus.triplesec.configuration.SmsConfiguration;
import org.safehaus.triplesec.configuration.SmtpConfiguration;
import org.safehaus.triplesec.registration.view.pages.WizardPage;
Modified: directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationWizard.java Mon Jul 23 06:50:14 2007
@@ -25,8 +25,8 @@
import wicket.examples.wizard.ezwizard.intf.IWizardStep;
import wicket.util.string.Strings;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
import org.safehaus.triplesec.registration.model.RegistrationInfo;
Modified: directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java Mon Jul 23 06:50:14 2007
@@ -37,12 +37,12 @@
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.math.RandomUtils;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
import org.safehaus.sms.Carrier;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
import org.safehaus.triplesec.configuration.SmsConfiguration;
import org.safehaus.triplesec.configuration.SmtpConfiguration;
import org.safehaus.triplesec.registration.model.RegistrationInfo;
Modified: directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/services/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/services/ConnectionManager.java?view=diff&rev=558727&r1=558726&r2=558727
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/services/ConnectionManager.java (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/services/ConnectionManager.java Mon Jul 23 06:50:14 2007
@@ -19,11 +19,11 @@
*/
package org.safehaus.triplesec.adminui.services;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
import org.safehaus.triplesec.adminui.models.ConnectionInfo;
import org.safehaus.triplesec.configuration.TriplesecStartupConfiguration;