directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r491261 [6/8] - in /directory/sandbox/triplesec-jacc: ./ admin-api/ admin-api/src/main/java/org/apache/ admin-api/src/main/java/org/apache/directory/ admin-api/src/main/java/org/apache/directory/triplesec/ admin-api/src/main/java/org/apache...
Date Sat, 30 Dec 2006 18:01:04 GMT
Modified: directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/EmailNotification.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.activation;
+package org.apache.directory.triplesec.activation;
 
 
 /**

Modified: directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccount.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/HotpAccountModifier.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/Notification.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationQueue.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/NotificationUtil.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ServletUtils.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/SmsNotification.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-activation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-activation/src/main/webapp/WEB-INF/web.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-activation/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-activation/src/main/webapp/WEB-INF/web.xml Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-changelog/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-changelog/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-changelog/pom.xml Sat Dec 30 10:00:46 2006
@@ -154,7 +154,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>
@@ -179,15 +179,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/triplesec-jacc/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-changelog/src/main/java/org/apache/directory/triplesec/changelogui/ChangelogController.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml Sat Dec 30 10:00:46 2006
@@ -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.triplesec.changelogui.ChangelogController</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 

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

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

Modified: directory/sandbox/triplesec-jacc/webapp-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/pom.xml Sat Dec 30 10:00:46 2006
@@ -147,7 +147,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>
@@ -176,19 +176,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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/model/TriplesecConfigSettings.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/model/TriplesecConfigSettings.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/model/TriplesecConfigSettings.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/model/TriplesecConfigSettings.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/CertificateUtil.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilder.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
@@ -58,12 +58,12 @@
 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.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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java Sat Dec 30 10:00:46 2006
@@ -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
 {

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.pages;
+package org.apache.directory.triplesec.configui.view.pages;
 
 
-import org.safehaus.triplesec.configui.view.TriplesecConfigWizard;
-import org.safehaus.triplesec.configui.view.panels.*;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.view.TriplesecConfigWizard;
+import org.apache.directory.triplesec.configui.view.panels.*;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 import wicket.model.IModel;
 import wicket.model.CompoundPropertyModel;
 import wicket.protocol.http.WebApplication;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.markup.html.panel.Panel;
 import wicket.markup.html.panel.FeedbackPanel;
@@ -33,8 +33,8 @@
 import java.util.Map;
 import java.util.Iterator;
 
-import org.safehaus.triplesec.configui.view.borders.WizardPanelBorder;
-import org.safehaus.triplesec.configui.view.pages.WizardPage;
+import org.apache.directory.triplesec.configui.view.borders.WizardPanelBorder;
+import org.apache.directory.triplesec.configui.view.pages.WizardPage;
 
 /**
  * Wizard steps are usually derived from a panel, and implement

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.model.IModel;
 import wicket.markup.html.form.PasswordTextField;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 
 import wicket.markup.html.form.CheckBox;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 
 import java.io.File;
@@ -30,9 +30,9 @@
 import wicket.Component;
 
 import org.apache.commons.io.FileUtils;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configui.util.TriplesecConfigTool;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.util.TriplesecConfigTool;
 
 
 public class WizardPanelFinish extends WizardPanel

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.model.IModel;
 

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.model.IModel;
 import wicket.markup.html.form.CheckBox;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.model.IModel;
 import wicket.model.Model;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 import wicket.model.IModel;
 import wicket.markup.html.form.CheckBox;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 
 import wicket.model.IModel;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 
 import wicket.markup.html.form.CheckBox;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.panels;
+package org.apache.directory.triplesec.configui.view.panels;
 
 
 import wicket.model.IModel;

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/main/webapp/WEB-INF/web.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/main/webapp/WEB-INF/web.xml Sat Dec 30 10:00:46 2006
@@ -28,7 +28,7 @@
     <servlet-class>wicket.protocol.http.WicketServlet</servlet-class>
     <init-param>
       <param-name>applicationClassName</param-name>
-      <param-value>org.safehaus.triplesec.configui.view.TriplesecConfigApplication</param-value>
+      <param-value>org.apache.directory.triplesec.configui.view.TriplesecConfigApplication</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui;
+package org.apache.directory.triplesec.configui;
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunConfigUI extends TriplesecIntegration

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
 
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 
 import junit.framework.TestCase;
 

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-
-import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import junit.framework.TestCase;
 

Modified: directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java Sat Dec 30 10:00:46 2006
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 import java.util.Properties;
 
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 
 import junit.framework.TestCase;
 
@@ -44,9 +44,9 @@
         assertEquals( "uid=admin,ou=system", defaults.getProperty( "java.naming.security.principal" ) );
         assertEquals( "secret", defaults.getProperty( "java.naming.security.credentials" ) );
         assertEquals( "dc=example,dc=com", defaults.getProperty( "java.naming.provider.url" ) );
-        assertEquals( "org.safehaus.triplesec.store.ProfileStateFactory", 
+        assertEquals( "org.apache.directory.triplesec.store.ProfileStateFactory",
             defaults.getProperty( "java.naming.factory.state" ) );
-        assertEquals( "org.safehaus.triplesec.store.ProfileObjectFactory", 
+        assertEquals( "org.apache.directory.triplesec.store.ProfileObjectFactory",
             defaults.getProperty( "java.naming.factory.object" ) );
         assertEquals( "EXAMPLE.COM", defaults.getProperty( "kdc.primary.realm" ) );
         assertEquals( "krbtgt/EXAMPLE.COM@EXAMPLE.COM", defaults.getProperty( "kdc.principal" ) );
@@ -68,7 +68,7 @@
         assertEquals( "true", defaults.getProperty( "kdc.tgs.renewable.allowed" ) );
         assertEquals( "ou=Users,dc=example,dc=com", defaults.getProperty( "safehaus.entry.basedn" ) );
         assertEquals( "true", defaults.getProperty( "safehaus.load.testdata" ) );
-        assertEquals( "org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier", 
+        assertEquals( "org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier",
             defaults.getProperty( "kerberos.sam.type.7" ) );
     }
 
@@ -87,9 +87,9 @@
         assertEquals( "uid=admin,ou=system", props.getProperty( "java.naming.security.principal" ) );
         assertEquals( "password", props.getProperty( "java.naming.security.credentials" ) );
         assertEquals( "dc=apache,dc=org", props.getProperty( "java.naming.provider.url" ) );
-        assertEquals( "org.safehaus.triplesec.store.ProfileStateFactory", 
+        assertEquals( "org.apache.directory.triplesec.store.ProfileStateFactory",
             props.getProperty( "java.naming.factory.state" ) );
-        assertEquals( "org.safehaus.triplesec.store.ProfileObjectFactory", 
+        assertEquals( "org.apache.directory.triplesec.store.ProfileObjectFactory",
             props.getProperty( "java.naming.factory.object" ) );
         assertEquals( "APACHE.ORG", props.getProperty( "kdc.primary.realm" ) );
         assertEquals( "krbtgt/APACHE.ORG@APACHE.ORG", props.getProperty( "kdc.principal" ) );
@@ -111,7 +111,7 @@
         assertEquals( "true", props.getProperty( "kdc.tgs.renewable.allowed" ) );
         assertEquals( "ou=Users,dc=apache,dc=org", props.getProperty( "safehaus.entry.basedn" ) );
         assertEquals( "false", props.getProperty( "safehaus.load.testdata" ) );
-        assertEquals( "org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier", 
+        assertEquals( "org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier",
             props.getProperty( "kerberos.sam.type.7" ) );
     }
 }

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

Modified: directory/sandbox/triplesec-jacc/webapp-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/pom.xml Sat Dec 30 10:00:46 2006
@@ -128,7 +128,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>
@@ -153,15 +153,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>demo</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.demo</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.demo</name>
                   <value>${basedir}/target/demo.war</value>
                 </property>
               </systemProperties>

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

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java Sat Dec 30 10:00:46 2006
@@ -17,9 +17,9 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.dao;
+package org.apache.directory.triplesec.demo.dao;
 
-import org.safehaus.triplesec.demo.model.Investments;
+import org.apache.directory.triplesec.demo.model.Investments;
 
 public interface InvestmentsDao
 {

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.dao;
+package org.apache.directory.triplesec.demo.dao;
 
 /**
  * Encapsulates the query parameters to be passed to the daos.

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.dao.jdbc;
+package org.apache.directory.triplesec.demo.dao.jdbc;
 
-import org.safehaus.triplesec.demo.dao.InvestmentsDao;
-import org.safehaus.triplesec.demo.model.Investments;
+import org.apache.directory.triplesec.demo.dao.InvestmentsDao;
+import org.apache.directory.triplesec.demo.model.Investments;
 
 import java.sql.Connection;
 import java.sql.ResultSet;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java Sat Dec 30 10:00:46 2006
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.dao.mock;
+package org.apache.directory.triplesec.demo.dao.mock;
 
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.dao.QueryParam;
-import org.safehaus.triplesec.demo.model.Account;
-import org.safehaus.triplesec.demo.service.Registry;
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.dao.QueryParam;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
 
 import java.util.Iterator;
 import java.util.Map;

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

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

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.security;
+package org.apache.directory.triplesec.demo.security;
 
 /**
  * Simple tagging interface that denotes a web page as requiring

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.security;
+package org.apache.directory.triplesec.demo.security;
 
-import org.safehaus.triplesec.demo.service.Registry;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.jaas.AccountLockedOutException;
-import org.safehaus.triplesec.jaas.PreauthFailedException;
-import org.safehaus.triplesec.jaas.ResynchInProgressException;
-import org.safehaus.triplesec.jaas.ResynchStartingException;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.jaas.AccountLockedOutException;
+import org.apache.directory.triplesec.jaas.PreauthFailedException;
+import org.apache.directory.triplesec.jaas.ResynchInProgressException;
+import org.apache.directory.triplesec.jaas.ResynchStartingException;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 import wicket.protocol.http.WebApplication;
 import wicket.protocol.http.WebSession;
 import wicket.util.string.Strings;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.security;
+package org.apache.directory.triplesec.demo.security;
 
 import wicket.authorization.strategies.page.SimplePageAuthorizationStrategy;
 import wicket.Session;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.service;
+package org.apache.directory.triplesec.demo.service;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.Callback;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.service;
+package org.apache.directory.triplesec.demo.service;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.service;
+package org.apache.directory.triplesec.demo.service;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 import javax.security.auth.login.LoginException;
 import java.util.Properties;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java Sat Dec 30 10:00:46 2006
@@ -24,7 +24,7 @@
  * Time: 12:02:48 AM
  * To change this template use File | Settings | File Templates.
  */
-package org.safehaus.triplesec.demo.service;
+package org.apache.directory.triplesec.demo.service;
 
 /**
  * A common place to get business delegates.

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.service;
+package org.apache.directory.triplesec.demo.service;
 
 /**
  * Created by IntelliJ IDEA.

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java Sat Dec 30 10:00:46 2006
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
 import wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.dao.QueryParam;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.dao.QueryParam;
 
 import java.util.Iterator;
 

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java Sat Dec 30 10:00:46 2006
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
 import wicket.model.AbstractDetachableModel;
 import wicket.model.IModel;
 import wicket.Component;
-import org.safehaus.triplesec.demo.model.Account;
-import org.safehaus.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
 
 /**
  * Base class for contact detachable models. This class implements

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
 import org.jCharts.chartData.ChartDataException;
 import org.jCharts.chartData.PieChartDataSet;
@@ -25,7 +25,7 @@
 import org.jCharts.properties.ChartProperties;
 import org.jCharts.properties.LegendProperties;
 import org.jCharts.properties.PieChart2DProperties;
-import org.safehaus.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.model.Account;
 import wicket.markup.html.image.resource.BufferedDynamicImageResource;
 
 import java.awt.Color;

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.model.Account;
 import wicket.model.IModel;
 
 public class ProxyDataProvider extends AccountDataProvider

Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.model.Account;
 
 public class ProxyModel extends AccountDetachableModel
 {



Mime
View raw message