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

svn commit: r564501 [5/7] - in /directory/sandbox/djencks/triplesec-jacc2: ./ admin-api/ admin-api2/ admin-api2/src/main/java/org/apache/ admin-api2/src/main/java/org/apache/directory/ admin-api2/src/main/java/org/apache/directory/triplesec/ admin-api2...

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProvisioningPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProvisioningPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProvisioningPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/java/org/apache/directory/triplesec/admin/swing/ProvisioningPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.awt.FlowLayout;
@@ -55,8 +55,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.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 
 public class ProvisioningPanel extends JPanel implements StatusObject, KeyListener, FocusListener

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/manifest/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/manifest/MANIFEST.MF?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/manifest/MANIFEST.MF (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/main/manifest/MANIFEST.MF Fri Aug 10 00:58:38 2007
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Main-Class: org.safehaus.triplesec.admin.swing.AdminFrame
+Main-Class: org.apache.directory.triplesec.admin.swing.AdminFrame
 Class-Path: logger.jar daemon.jar bootstrapper.jar 
  ../lib/antlr-2.7.6.jar 
  ../lib/apacheds-core-1.0.0.jar 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/LaunchAdminFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/LaunchAdminFrame.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/LaunchAdminFrame.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/LaunchAdminFrame.java Fri Aug 10 00:58:38 2007
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.util.Properties;
 
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class LaunchAdminFrame extends TriplesecIntegration
@@ -67,7 +67,7 @@
 
         try
         {
-            Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+            Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
         }
         catch ( ClassNotFoundException e1 )
         {

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/SettingsUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/SettingsUtilsTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/SettingsUtilsTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-admin/src/test/java/org/apache/directory/triplesec/admin/swing/SettingsUtilsTest.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.admin.swing;
+package org.apache.directory.triplesec.admin.swing;
 
 
 import java.io.File;
 import java.io.IOException;
 
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 
 import junit.framework.TestCase;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-demo/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-demo/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-demo/pom.xml Fri Aug 10 00:58:38 2007
@@ -67,7 +67,7 @@
         <configuration>
           <systemProperties>
             <property>
-              <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+              <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
               <value>${basedir}/src/test/resources</value>
             </property>
           </systemProperties>
@@ -79,7 +79,7 @@
       	<configuration>
       	  <archive>
       	    <manifest>
-      	      <mainClass>org.safehaus.triplesec.guardian.demo.DemoFrame</mainClass>
+      	      <mainClass>org.apache.directory.triplesec.guardian.demo.DemoFrame</mainClass>
       	    </manifest>
       	  </archive>
       	</configuration>
@@ -90,7 +90,7 @@
       	<configuration>
       	  <archive>
       	    <manifest>
-      	      <mainClass>org.safehaus.triplesec.guardian.demo.DemoFrame</mainClass>
+      	      <mainClass>org.apache.directory.triplesec.guardian.demo.DemoFrame</mainClass>
       	    </manifest> 
       	  </archive>
           <descriptor>src/main/assembly/demo.xml</descriptor>
@@ -171,7 +171,7 @@
                   <value>${basedir}/target/settingsFile</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
               </systemProperties>
@@ -196,7 +196,7 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
                 <property>

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-demo/sample.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-demo/sample.properties?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-demo/sample.properties (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-demo/sample.properties Fri Aug 10 00:58:38 2007
@@ -2,4 +2,4 @@
 connectionUrl=ldap://localhost:10389/dc=example,dc=com
 applicationCredentials=secret
 applicationPrincipalDn=appname=demo,ou=Applications,dc=example,dc=com
-driver=org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver
+driver=org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/DemoFrame.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/DemoFrame.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/DemoFrame.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/DemoFrame.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.demo;
+package org.apache.directory.triplesec.guardian.demo;
 
 
 import java.awt.BorderLayout;
@@ -39,13 +39,13 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextPane;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.ChangeType;
-import org.safehaus.triplesec.guardian.PolicyChangeListener;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Role;
-import org.safehaus.triplesec.guardian.StringPermission;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.ChangeType;
+import org.apache.directory.triplesec.guardian.PolicyChangeListener;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Role;
+import org.apache.directory.triplesec.guardian.StringPermission;
 
 
 public class DemoFrame extends JFrame
@@ -72,7 +72,7 @@
     private JTextPane jTextPane = null;
 
     static ApplicationPolicy policy = null;
-    static String driver = "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver";
+    static String driver = "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver";
     static String connectionUrl = "ldap://localhost:10389/dc=example,dc=com";
     static String applicationPrincipalDn = "appname=demo,ou=Applications,dc=example,dc=com";
     static String applicationCredentials = "secret";

Modified: directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/LoginCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/LoginCommand.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/LoginCommand.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/swing-demo/src/main/java/org/apache/directory/triplesec/guardian/demo/LoginCommand.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.guardian.demo;
+package org.apache.directory.triplesec.guardian.demo;
 
 
 import javax.security.auth.spi.LoginModule;
@@ -29,12 +29,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 
 /**

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/tools/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/tools/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/tools/pom.xml Fri Aug 10 00:58:38 2007
@@ -54,7 +54,7 @@
           <archive>
             <manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>
             <manifest>
-              <mainClass>org.safehaus.triplesec.tools.Tools</mainClass>
+              <mainClass>org.apache.directory.triplesec.tools.Tools</mainClass>
             </manifest>
           </archive>
         </configuration>

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

Modified: directory/sandbox/djencks/triplesec-jacc2/tools/src/main/manifest/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/tools/src/main/manifest/MANIFEST.MF?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/tools/src/main/manifest/MANIFEST.MF (original)
+++ directory/sandbox/djencks/triplesec-jacc2/tools/src/main/manifest/MANIFEST.MF Fri Aug 10 00:58:38 2007
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Main-Class: org.safehaus.triplesec.tools.Tools
+Main-Class: org.apache.directory.triplesec.tools.Tools
 Class-Path: logger.jar daemon.jar bootstrapper.jar 
  ../lib/antlr-2.7.2.jar 
  ../lib/apacheds-core-1.0-RC3.jar 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java Fri Aug 10 00:58:38 2007
@@ -17,10 +17,9 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.verifier.hotp;
+package org.apache.directory.triplesec.verifier.hotp;
 
 
-import java.io.File;
 import java.util.*;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -31,8 +30,8 @@
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import org.safehaus.triplesec.store.*;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.*;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 import org.safehaus.profile.ServerProfile;
 import org.safehaus.profile.BaseServerProfileModifier;
 import org.safehaus.otp.Hotp;
@@ -80,7 +79,8 @@
             MutableStartupConfiguration config = new MutableStartupConfiguration();
 
             MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
-            partConfig.setName( "example" );
+//            partConfig.setName( "example" );
+            partConfig.setId( "example" );
 
             HashSet indices = new HashSet();
             indices.add( "dc" );

Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.verifier.hotp;
+package org.apache.directory.triplesec.verifier.hotp;
 
 
 import java.io.IOException;
@@ -29,9 +29,7 @@
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.BasicAttribute;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
@@ -57,7 +55,6 @@
 import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 //import org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter;
-import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.directory.server.schema.bootstrap.SystemSchema;
 import org.apache.directory.server.schema.bootstrap.ApacheSchema;
 import org.apache.directory.server.schema.bootstrap.CoreSchema;
@@ -72,11 +69,11 @@
 import org.safehaus.otp.HotpErrorConstants;
 import org.safehaus.otp.ResynchParameters;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.store.DefaultServerProfileStore;
-import org.safehaus.triplesec.store.ServerProfileStore;
-import org.safehaus.triplesec.store.ProfileStateFactory;
-import org.safehaus.triplesec.store.ProfileObjectFactory;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.store.DefaultServerProfileStore;
+import org.apache.directory.triplesec.store.ServerProfileStore;
+import org.apache.directory.triplesec.store.ProfileStateFactory;
+import org.apache.directory.triplesec.store.ProfileObjectFactory;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 
 
 /**
@@ -111,7 +108,8 @@
         config.setWorkingDirectory( workingDirectory );
         config.setShutdownHookEnabled( false );
         MutablePartitionConfiguration partConfig = new MutablePartitionConfiguration();
-        partConfig.setName( "example" );
+//        partConfig.setName( "example" );
+        partConfig.setId( "example" );
 
         HashSet indices = new HashSet();
         indices.add( "dc" );

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.activation;
+package org.apache.directory.triplesec.activation;
 
 
 import java.io.File;
@@ -41,9 +41,9 @@
 
 import org.safehaus.otp.HotpAttributes;
 import org.safehaus.otp.HotpAttributesCipher;
-import org.safehaus.triplesec.configuration.ActivationConfiguration;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.configuration.ActivationConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.activation;
+package org.apache.directory.triplesec.activation;
 
 
 import java.io.File;
@@ -40,7 +40,7 @@
 
 import org.safehaus.otp.HotpAttributes;
 import org.safehaus.otp.HotpAttributesCipher;
-import org.safehaus.triplesec.utils.hauskeys.HauskeysMidletBuilder;
+import org.apache.directory.triplesec.utils.hauskeys.HauskeysMidletBuilder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

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

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.activation;
+package org.apache.directory.triplesec.activation;
 
 
 import java.io.IOException;
@@ -34,8 +34,8 @@
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/WEB-INF/web.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/webapp/WEB-INF/web.xml Fri Aug 10 00:58:38 2007
@@ -5,7 +5,7 @@
 
     <filter>
       <filter-name>activation</filter-name>
-      <filter-class>org.safehaus.triplesec.activation.ActivateAccountFilter</filter-class>
+      <filter-class>org.apache.directory.triplesec.activation.ActivateAccountFilter</filter-class>
 
       <!-- LDAP Connection Settings -->
 

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelogui;
+package org.apache.directory.triplesec.changelogui;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -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/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml Fri Aug 10 00:58:38 2007
@@ -51,7 +51,7 @@
       The backing data bean
     </description>
     <managed-bean-name>ChangelogController</managed-bean-name>
-    <managed-bean-class>org.safehaus.triplesec.changelogui.ChangelogController</managed-bean-class>
+    <managed-bean-class>org.apache.directory.triplesecriplesec.changelogui.ChangelogController</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-changelog/src/test/java/org/apache/directory/triplesec/changelogui/TriplesecChangelogWebappUnit.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.changelogui;
+package org.apache.directory.triplesec.changelogui;
 
 import java.io.File;
 import java.sql.Connection;
@@ -28,7 +28,7 @@
 
 import javax.naming.NamingException;
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 public class TriplesecChangelogWebappUnit extends TriplesecIntegration
 {

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
 
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.apache.tools.ant.taskdefs.Execute;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 
 
 public class CertificateUtil

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
@@ -62,12 +62,12 @@
 import org.apache.directory.server.schema.registries.DefaultRegistries;
 import org.apache.directory.server.schema.registries.DefaultOidRegistry;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
-import org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor;
-import org.safehaus.triplesec.store.schema.SafehausSchema;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor;
+import org.apache.directory.triplesec.store.schema.SafehausSchema;
 
 
 /**

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
@@ -53,15 +53,15 @@
 import org.apache.tools.ant.taskdefs.Delete;
 import org.dom4j.io.OutputFormat;
 
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configuration.ContextParameter;
-import org.safehaus.triplesec.configuration.FilterConfiguration;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
-import org.safehaus.triplesec.configuration.ServerXmlUtils;
-import org.safehaus.triplesec.configuration.ServletConfiguration;
-import org.safehaus.triplesec.configuration.WebappConfiguration;
-import org.safehaus.triplesec.configuration.XmlUtils;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configuration.ContextParameter;
+import org.apache.directory.triplesec.configuration.FilterConfiguration;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.configuration.ServerXmlUtils;
+import org.apache.directory.triplesec.configuration.ServletConfiguration;
+import org.apache.directory.triplesec.configuration.WebappConfiguration;
+import org.apache.directory.triplesec.configuration.XmlUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java Fri Aug 10 00:58:38 2007
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.util.Properties;
 
 import org.apache.directory.shared.ldap.util.NamespaceTools;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 
 
 /**
@@ -76,8 +76,8 @@
         props.put( "java.naming.security.principal", "uid=admin,ou=system" );
         props.put( "java.naming.security.credentials", "secret" );
         props.put( "java.naming.provider.url", "dc=example,dc=com" );
-        props.put( "java.naming.factory.state", "org.safehaus.triplesec.store.ProfileStateFactory" );
-        props.put( "java.naming.factory.object", "org.safehaus.triplesec.store.ProfileObjectFactory" );
+        props.put( "java.naming.factory.state", "org.apache.directory.triplesec.store.ProfileStateFactory" );
+        props.put( "java.naming.factory.object", "org.apache.directory.triplesec.store.ProfileObjectFactory" );
         props.put( "kdc.primary.realm", "EXAMPLE.COM" );
         props.put( "kdc.principal", "krbtgt/EXAMPLE.COM@EXAMPLE.COM" );
         props.put( "kdc.encryption.types", "des-cbc-md5 des3-cbc-sha1 des3-cbc-md5 des-cbc-md4 des-cbc-crc" );
@@ -99,7 +99,7 @@
         
         props.put( "safehaus.entry.basedn", "ou=Users,dc=example,dc=com" );
         props.put( "safehaus.load.testdata", "true" );
-        props.put( "kerberos.sam.type.7", "org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier" );
+        props.put( "kerberos.sam.type.7", "org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier" );
         return props;
     }
 }

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view;
+package org.apache.directory.triplesec.configui.view;
 
 
 import wicket.protocol.http.WebApplication;
-import org.safehaus.triplesec.configui.view.pages.WizardPage;
+import org.apache.directory.triplesec.configui.view.pages.WizardPage;
 
 public class TriplesecConfigApplication extends WebApplication
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java Fri Aug 10 00:58:38 2007
@@ -17,14 +17,14 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view;
+package org.apache.directory.triplesec.configui.view;
 
 import wicket.examples.wizard.ezwizard.impl.Wizard;
 import wicket.examples.wizard.ezwizard.impl.WizardTransition;
 import wicket.examples.wizard.ezwizard.intf.IWizardStep;
 import wicket.util.string.Strings;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configui.util.CertificateUtil;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.util.CertificateUtil;
 
 import java.io.File;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.borders;
+package org.apache.directory.triplesec.configui.view.borders;
 
 
 import wicket.markup.html.border.Border;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.borders;
+package org.apache.directory.triplesec.configui.view.borders;
 
 
 import wicket.markup.html.border.Border;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.pages;
+package org.apache.directory.triplesec.configui.view.pages;
 
 import wicket.markup.html.WebPage;
 import wicket.markup.html.border.Border;
-import org.safehaus.triplesec.configui.view.borders.AppPageBorder;
+import org.apache.directory.triplesec.configui.view.borders.AppPageBorder;
 
 public abstract class BasePage extends WebPage
 {