directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckopp...@apache.org
Subject svn commit: r558807 [1/2] - in /directory/triplesec/trunk: configuration-io/src/main/java/org/apache/ configuration-io/src/main/java/org/apache/directory/ configuration-io/src/main/java/org/apache/directory/triplesec/ configuration-io/src/main/java/org...
Date Mon, 23 Jul 2007 17:34:28 GMT
Author: ckoppelt
Date: Mon Jul 23 10:34:10 2007
New Revision: 558807

URL: http://svn.apache.org/viewvc?view=rev&rev=558807
Log:
renamed packages in configuration, configuration-io, crypto

Added:
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ContextParameter.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ContextParameter.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/FilterConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/FilterConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/InitParameter.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/InitParameter.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServerXmlUtils.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServletConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServletConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/WebappConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/WebappConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/XmlUtils.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/XmlUtils.java
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/ServerXmlUtilsTest.java
    directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/WebappConfigurationTest.java
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddEnvironment0.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddEnvironment0.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddEnvironment1.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddEnvironment1.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValue.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddInitParameterValue.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddInitParameterValueInitial.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddInitParameterValueInitial.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValue.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddServletInitParameterValue.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testAddServletInitParameterValueInitial.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testAddServletInitParameterValueInitial.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValue.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testSetInitParameterValue.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetInitParameterValueInitial.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testSetInitParameterValueInitial.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValue.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testSetServletInitParameterValue.xml
    directory/triplesec/trunk/configuration-io/src/test/resources/org/apache/directory/triplesec/configuration/testSetServletInitParameterValueInitial.xml
      - copied unchanged from r558676, directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/triplesec/configuration/testSetServletInitParameterValueInitial.xml
    directory/triplesec/trunk/configuration/src/main/java/org/apache/
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/ActivationConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/ActivationConfiguration.java
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/MutableTriplesecStartupConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/MutableTriplesecStartupConfiguration.java
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmsConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmsConfiguration.java
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmtpConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmtpConfiguration.java
    directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/TriplesecStartupConfiguration.java
      - copied, changed from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/TriplesecStartupConfiguration.java
    directory/triplesec/trunk/configuration/src/test/java/org/apache/
    directory/triplesec/trunk/configuration/src/test/java/org/apache/directory/
    directory/triplesec/trunk/configuration/src/test/java/org/apache/directory/triplesec/
    directory/triplesec/trunk/configuration/src/test/java/org/apache/directory/triplesec/configuration/
    directory/triplesec/trunk/crypto/src/main/java/org/apache/
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipher.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipher.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipherWrapper.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipherWrapper.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/CipherParameters.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/CipherParameters.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DESEngine.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DESEngine.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DataLengthException.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DataLengthException.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Digest.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Digest.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/GeneralDigest.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/GeneralDigest.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/HMac.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/HMac.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/KeyParameter.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/KeyParameter.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Mac.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Mac.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/RuntimeCryptoException.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/RuntimeCryptoException.java
    directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/SHA1Digest.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/SHA1Digest.java
    directory/triplesec/trunk/crypto/src/test/org/apache/
    directory/triplesec/trunk/crypto/src/test/org/apache/directory/
    directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/
    directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/
    directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/BlockCipherWrapperTest.java
      - copied, changed from r558676, directory/triplesec/trunk/crypto/src/test/org/safehaus/crypto/BlockCipherWrapperTest.java
Removed:
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ContextParameter.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/FilterConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/InitParameter.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServerXmlUtils.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServletConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/WebappConfiguration.java
    directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/XmlUtils.java
    directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/
    directory/triplesec/trunk/configuration-io/src/test/resources/org/safehaus/
    directory/triplesec/trunk/configuration/src/main/java/org/safehaus/
    directory/triplesec/trunk/configuration/src/test/java/org/safehaus/
    directory/triplesec/trunk/crypto/src/main/java/org/safehaus/
    directory/triplesec/trunk/crypto/src/test/org/safehaus/
Modified:
    directory/triplesec/trunk/guardian-ldap/src/test/resources/server.xml
    directory/triplesec/trunk/integration/src/test/resources/server.xml
    directory/triplesec/trunk/main/conf/server.xml
    directory/triplesec/trunk/main/src/main/java/org/safehaus/triplesec/Service.java
    directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/Hotp.java
    directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/HotpAttributesCipher.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminToolSettings.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConfigurationFileManager.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConnectionManager.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ProvisioningPanel.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsEditor.java
    directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsUtils.java
    directory/triplesec/trunk/swing-admin/src/test/java/org/safehaus/triplesec/admin/swing/SettingsUtilsTest.java
    directory/triplesec/trunk/swing-admin/src/test/resources/server.xml
    directory/triplesec/trunk/swing-demo/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivateAccountFilter.java
    directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java
    directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilder.java
    directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java
    directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java
    directory/triplesec/trunk/webapp-config/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/TriplesecRegistrationApplication.java
    directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java
    directory/triplesec/trunk/webapp-registration/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-servlet-demo/src/test/resources/server.xml
    directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/services/ConnectionManager.java
    directory/triplesec/trunk/webapp-wicket-admin/src/test/resources/server.xml

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ContextParameter.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ContextParameter.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ContextParameter.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ContextParameter.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ContextParameter.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ContextParameter.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ContextParameter.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import org.dom4j.Element;

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/FilterConfiguration.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/FilterConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/FilterConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/FilterConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/FilterConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/FilterConfiguration.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/FilterConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 import java.util.HashMap;
 import java.util.Iterator;

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/InitParameter.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/InitParameter.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/InitParameter.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/InitParameter.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/InitParameter.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/InitParameter.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/InitParameter.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import org.dom4j.Element;

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServerXmlUtils.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServerXmlUtils.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServerXmlUtils.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServerXmlUtils.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;
@@ -116,7 +116,7 @@
         Element bean = beansElement.addElement( "bean" );
         bean.addAttribute( "id", "configuration" );
         bean.addAttribute( "class", 
-            "org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration" );
+            "org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration" );
         
         if ( configuration.getPresentationBaseUrl() != null )
         {

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServletConfiguration.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServletConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServletConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServletConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServletConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/ServletConfiguration.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/ServletConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.util.HashMap;

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/WebappConfiguration.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/WebappConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/WebappConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/WebappConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/WebappConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/WebappConfiguration.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/WebappConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;

Copied: directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/XmlUtils.java (from r558676, directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/XmlUtils.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/XmlUtils.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/XmlUtils.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/XmlUtils.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/main/java/org/safehaus/triplesec/configuration/XmlUtils.java (original)
+++ directory/triplesec/trunk/configuration-io/src/main/java/org/apache/directory/triplesec/configuration/XmlUtils.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;

Copied: directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java (from r558676, directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/ServerXmlUtilsTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/ServerXmlUtilsTest.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/ServerXmlUtilsTest.java (original)
+++ directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ServerXmlUtilsTest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;

Copied: directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java (from r558676, directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/WebappConfigurationTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/WebappConfigurationTest.java&r1=558676&p2=directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration-io/src/test/java/org/safehaus/triplesec/configuration/WebappConfigurationTest.java (original)
+++ directory/triplesec/trunk/configuration-io/src/test/java/org/apache/directory/triplesec/configuration/WebappConfigurationTest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;

Copied: directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/ActivationConfiguration.java (from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/ActivationConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/ActivationConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/ActivationConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/ActivationConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/ActivationConfiguration.java (original)
+++ directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/ActivationConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 /**

Copied: directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/MutableTriplesecStartupConfiguration.java (from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/MutableTriplesecStartupConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/MutableTriplesecStartupConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/MutableTriplesecStartupConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/MutableTriplesecStartupConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/MutableTriplesecStartupConfiguration.java (original)
+++ directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/MutableTriplesecStartupConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import java.io.File;

Copied: directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmsConfiguration.java (from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmsConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmsConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmsConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmsConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmsConfiguration.java (original)
+++ directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmsConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 /**

Copied: directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmtpConfiguration.java (from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmtpConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmtpConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmtpConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmtpConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/SmtpConfiguration.java (original)
+++ directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/SmtpConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 /**

Copied: directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/TriplesecStartupConfiguration.java (from r558676, directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/TriplesecStartupConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/TriplesecStartupConfiguration.java?view=diff&rev=558807&p1=directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/TriplesecStartupConfiguration.java&r1=558676&p2=directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/TriplesecStartupConfiguration.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/configuration/src/main/java/org/safehaus/triplesec/configuration/TriplesecStartupConfiguration.java (original)
+++ directory/triplesec/trunk/configuration/src/main/java/org/apache/directory/triplesec/configuration/TriplesecStartupConfiguration.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configuration;
+package org.apache.directory.triplesec.configuration;
 
 
 import org.apache.directory.server.configuration.ServerStartupConfiguration;

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipher.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipher.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipher.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipher.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipher.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipher.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipher.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipherWrapper.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipherWrapper.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipherWrapper.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipherWrapper.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipherWrapper.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/BlockCipherWrapper.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/BlockCipherWrapper.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 import java.io.UnsupportedEncodingException;
@@ -164,7 +164,7 @@
 //        int bits = passwordBytes.length << 3;
         byte[] key;
 
-//        if ( engineClass.getName().equals( "org.safehaus.crypto.AESEngine" ) )
+//        if ( engineClass.getName().equals( "org.apache.directory.triplesec.crypto.AESEngine" ) )
 //        {
 //            if ( bits < 128 )
 //            {
@@ -182,7 +182,7 @@
 //                System.arraycopy( passwordBytes, 0, key, 0, passwordBytes.length );
 //            }
 //        }
-//        else if ( engineClass.getName().equals( "org.safehaus.crypto.DESEngine" ) )
+//        else if ( engineClass.getName().equals( "org.apache.directory.triplesec.crypto.DESEngine" ) )
 //        {
             key = new byte[8];
 

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/CipherParameters.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/CipherParameters.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/CipherParameters.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/CipherParameters.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/CipherParameters.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/CipherParameters.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/CipherParameters.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 /**
  * all parameter classes implement this.

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DESEngine.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DESEngine.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DESEngine.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DESEngine.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DESEngine.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DESEngine.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DESEngine.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DataLengthException.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DataLengthException.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DataLengthException.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DataLengthException.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DataLengthException.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/DataLengthException.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/DataLengthException.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 /**
  * this exception is thrown if a buffer that is meant to have output

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Digest.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Digest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Digest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Digest.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Digest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Digest.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Digest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 /**
  * interface that a message digest conforms to.

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/GeneralDigest.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/GeneralDigest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/GeneralDigest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/GeneralDigest.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/GeneralDigest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/GeneralDigest.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/GeneralDigest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/HMac.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/HMac.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/HMac.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/HMac.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/HMac.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/HMac.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/HMac.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/KeyParameter.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/KeyParameter.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/KeyParameter.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/KeyParameter.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/KeyParameter.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/KeyParameter.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/KeyParameter.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 public class KeyParameter

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Mac.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Mac.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Mac.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Mac.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Mac.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/Mac.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/Mac.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/RuntimeCryptoException.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/RuntimeCryptoException.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/RuntimeCryptoException.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/RuntimeCryptoException.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/RuntimeCryptoException.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/RuntimeCryptoException.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/RuntimeCryptoException.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 /**
  * the foundation class for the exceptions thrown by the crypto packages.

Copied: directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/SHA1Digest.java (from r558676, directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/SHA1Digest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/SHA1Digest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/SHA1Digest.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/SHA1Digest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/main/java/org/safehaus/crypto/SHA1Digest.java (original)
+++ directory/triplesec/trunk/crypto/src/main/java/org/apache/directory/triplesec/crypto/SHA1Digest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 /**

Copied: directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/BlockCipherWrapperTest.java (from r558676, directory/triplesec/trunk/crypto/src/test/org/safehaus/crypto/BlockCipherWrapperTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/BlockCipherWrapperTest.java?view=diff&rev=558807&p1=directory/triplesec/trunk/crypto/src/test/org/safehaus/crypto/BlockCipherWrapperTest.java&r1=558676&p2=directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/BlockCipherWrapperTest.java&r2=558807
==============================================================================
--- directory/triplesec/trunk/crypto/src/test/org/safehaus/crypto/BlockCipherWrapperTest.java (original)
+++ directory/triplesec/trunk/crypto/src/test/org/apache/directory/triplesec/crypto/BlockCipherWrapperTest.java Mon Jul 23 10:34:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.crypto;
+package org.apache.directory.triplesec.crypto;
 
 
 import junit.framework.TestCase;

Modified: directory/triplesec/trunk/guardian-ldap/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/guardian-ldap/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/guardian-ldap/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/guardian-ldap/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/integration/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/integration/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/integration/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/integration/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
     
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
         <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/main/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/main/conf/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/main/conf/server.xml (original)
+++ directory/triplesec/trunk/main/conf/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/main/src/main/java/org/safehaus/triplesec/Service.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/main/src/main/java/org/safehaus/triplesec/Service.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/main/src/main/java/org/safehaus/triplesec/Service.java (original)
+++ directory/triplesec/trunk/main/src/main/java/org/safehaus/triplesec/Service.java Mon Jul 23 10:34:10 2007
@@ -37,6 +37,7 @@
 import org.apache.directory.server.kerberos.sam.SamSubsystem;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.PropertiesUtils;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import org.mortbay.http.SocketListener;
 import org.mortbay.jetty.Server;
@@ -45,7 +46,6 @@
 import org.safehaus.profile.BaseServerProfileModifier;
 import org.safehaus.profile.ProfileTestData;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
 import org.safehaus.triplesec.store.DefaultServerProfileStore;
 import org.safehaus.triplesec.store.ServerProfileStore;
 

Modified: directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/Hotp.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/Hotp.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/Hotp.java (original)
+++ directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/Hotp.java Mon Jul 23 10:34:10 2007
@@ -20,10 +20,10 @@
 package org.safehaus.otp;
 
 
-import org.safehaus.crypto.HMac;
-import org.safehaus.crypto.SHA1Digest;
-import org.safehaus.crypto.KeyParameter;
-import org.safehaus.crypto.CipherParameters;
+import org.apache.directory.triplesec.crypto.CipherParameters;
+import org.apache.directory.triplesec.crypto.HMac;
+import org.apache.directory.triplesec.crypto.KeyParameter;
+import org.apache.directory.triplesec.crypto.SHA1Digest;
 
 
 /**

Modified: directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/HotpAttributesCipher.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/HotpAttributesCipher.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/HotpAttributesCipher.java (original)
+++ directory/triplesec/trunk/otp/src/main/java/org/safehaus/otp/HotpAttributesCipher.java Mon Jul 23 10:34:10 2007
@@ -20,8 +20,8 @@
 package org.safehaus.otp;
 
 
-import org.safehaus.crypto.BlockCipherWrapper;
-import org.safehaus.crypto.DESEngine;
+import org.apache.directory.triplesec.crypto.BlockCipherWrapper;
+import org.apache.directory.triplesec.crypto.DESEngine;
 
 import java.io.UnsupportedEncodingException;
 

Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminToolSettings.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminToolSettings.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminToolSettings.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/AdminToolSettings.java Mon Jul 23 10:34:10 2007
@@ -20,8 +20,8 @@
 package org.safehaus.triplesec.admin.swing;
 
 
-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 AdminToolSettings

Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConfigurationFileManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConfigurationFileManager.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConfigurationFileManager.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/ConfigurationFileManager.java Mon Jul 23 10:34:10 2007
@@ -36,8 +36,8 @@
 import javax.swing.JProgressBar;
 import javax.swing.filechooser.FileFilter;
 
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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=558807&r1=558806&r2=558807
==============================================================================
--- 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 10:34:10 2007
@@ -38,7 +38,7 @@
 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.apache.directory.triplesec.configuration.TriplesecStartupConfiguration;
 import org.safehaus.triplesec.guardian.ApplicationPolicy;
 import org.safehaus.triplesec.guardian.Profile;
 import org.safehaus.triplesec.jaas.PasscodeCallback;

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=558807&r1=558806&r2=558807
==============================================================================
--- 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 10:34:10 2007
@@ -55,7 +55,7 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.directory.triplesec.admin.HauskeysUser;
 import org.apache.directory.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import com.sun.mail.smtp.SMTPTransport;
 

Modified: directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsEditor.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsEditor.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsEditor.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsEditor.java Mon Jul 23 10:34:10 2007
@@ -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/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsUtils.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsUtils.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsUtils.java (original)
+++ directory/triplesec/trunk/swing-admin/src/main/java/org/safehaus/triplesec/admin/swing/SettingsUtils.java Mon Jul 23 10:34:10 2007
@@ -29,10 +29,10 @@
 import java.util.Date;
 import java.util.Properties;
 
-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;
+import org.apache.directory.triplesec.crypto.BlockCipherWrapper;
+import org.apache.directory.triplesec.crypto.DESEngine;
 
 
 public class SettingsUtils

Modified: directory/triplesec/trunk/swing-admin/src/test/java/org/safehaus/triplesec/admin/swing/SettingsUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/test/java/org/safehaus/triplesec/admin/swing/SettingsUtilsTest.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/test/java/org/safehaus/triplesec/admin/swing/SettingsUtilsTest.java (original)
+++ directory/triplesec/trunk/swing-admin/src/test/java/org/safehaus/triplesec/admin/swing/SettingsUtilsTest.java Mon Jul 23 10:34:10 2007
@@ -23,8 +23,8 @@
 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/triplesec/trunk/swing-admin/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-admin/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-admin/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/swing-admin/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/swing-demo/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/swing-demo/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/swing-demo/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/swing-demo/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivateAccountFilter.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivateAccountFilter.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivateAccountFilter.java (original)
+++ directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivateAccountFilter.java Mon Jul 23 10:34:10 2007
@@ -39,11 +39,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.directory.triplesec.configuration.ActivationConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java (original)
+++ directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/NotificationUtil.java Mon Jul 23 10:34:10 2007
@@ -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/triplesec/trunk/webapp-changelog/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilder.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilder.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilder.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilder.java Mon Jul 23 10:34:10 2007
@@ -58,10 +58,10 @@
 import org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler;
 import org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 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;
 

Modified: directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java Mon Jul 23 10:34:10 2007
@@ -48,6 +48,13 @@
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.util.Base64;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
+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.apache.tools.ant.Project;
 //import org.apache.tools.ant.taskdefs.Copy;
 import org.apache.tools.ant.taskdefs.Delete;
@@ -55,13 +62,6 @@
 
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java (original)
+++ directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java Mon Jul 23 10:34:10 2007
@@ -24,8 +24,8 @@
 import javax.naming.directory.Attributes;
 
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import junit.framework.TestCase;
 

Modified: directory/triplesec/trunk/webapp-config/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-config/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

Modified: directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml?view=diff&rev=558807&r1=558806&r2=558807
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml Mon Jul 23 10:34:10 2007
@@ -42,7 +42,7 @@
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>

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=558807&r1=558806&r2=558807
==============================================================================
--- 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 10:34:10 2007
@@ -29,8 +29,8 @@
 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.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.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/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=558807&r1=558806&r2=558807
==============================================================================
--- 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 10:34:10 2007
@@ -42,9 +42,9 @@
 import org.apache.directory.triplesec.admin.HauskeysUser;
 import org.apache.directory.triplesec.admin.HauskeysUserModifier;
 import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
 import org.safehaus.sms.Carrier;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
 import org.safehaus.triplesec.registration.model.RegistrationInfo;
 import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication;
 



Mime
View raw message