directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckopp...@apache.org
Subject svn commit: r558849 [6/6] - in /directory/triplesec/trunk: admin-api/ admin-api/src/test/java/org/apache/directory/triplesec/admin/ admin-api/src/test/resources/ guardian-api/src/main/java/org/apache/ guardian-api/src/main/java/org/apache/directory/ gu...
Date Mon, 23 Jul 2007 20:02:03 GMT
Modified: directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitor.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitor.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitor.java (original)
+++ directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitor.java Mon Jul 23 13:01:54 2007
@@ -22,8 +22,8 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.triplesec.otp.ResynchParameters;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.otp.ResynchParameters;
 
 
 /**

Modified: directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitorAdapter.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitorAdapter.java (original)
+++ directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/HotpMonitorAdapter.java Mon Jul 23 13:01:54 2007
@@ -22,8 +22,8 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.triplesec.otp.ResynchParameters;
 import org.safehaus.profile.ServerProfile;
-import org.safehaus.otp.ResynchParameters;
 import org.safehaus.triplesec.verifier.hotp.HotpMonitor;
 
 

Modified: directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/PreauthFailedException.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/PreauthFailedException.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/PreauthFailedException.java (original)
+++ directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/PreauthFailedException.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.verifier.hotp;
 
 
-import org.safehaus.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
 import org.safehaus.triplesec.verifier.hotp.HotpException;
 
 

Modified: directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchInProgressException.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchInProgressException.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchInProgressException.java (original)
+++ directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchInProgressException.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.verifier.hotp;
 
 
-import org.safehaus.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
 import org.safehaus.triplesec.verifier.hotp.HotpException;
 
 

Modified: directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchStartingException.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchStartingException.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchStartingException.java (original)
+++ directory/triplesec/trunk/verifier/src/main/java/org/safehaus/triplesec/verifier/hotp/ResynchStartingException.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.verifier.hotp;
 
 
-import org.safehaus.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
 import org.safehaus.triplesec.verifier.hotp.HotpException;
 
 

Modified: directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/GenerateHotp.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/GenerateHotp.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/GenerateHotp.java (original)
+++ directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/GenerateHotp.java Mon Jul 23 13:01:54 2007
@@ -36,8 +36,6 @@
 import org.safehaus.triplesec.store.schema.SafehausSchema;
 import org.safehaus.profile.ServerProfile;
 import org.safehaus.profile.BaseServerProfileModifier;
-import org.safehaus.otp.Hotp;
-import org.safehaus.otp.Base64;
 import org.apache.directory.server.core.schema.bootstrap.*;
 import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
@@ -46,6 +44,8 @@
 import org.apache.directory.shared.ldap.message.LockableAttributeImpl;
 import org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+import org.apache.directory.triplesec.otp.Base64;
+import org.apache.directory.triplesec.otp.Hotp;
 
 
 /**

Modified: directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/HotpSamVerifierITest.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/HotpSamVerifierITest.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/HotpSamVerifierITest.java (original)
+++ directory/triplesec/trunk/verifier/src/test/java/org/safehaus/triplesec/verifier/hotp/HotpSamVerifierITest.java Mon Jul 23 13:01:54 2007
@@ -65,9 +65,9 @@
 import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
 import org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
-import org.safehaus.otp.Hotp;
-import org.safehaus.otp.HotpErrorConstants;
-import org.safehaus.otp.ResynchParameters;
+import org.apache.directory.triplesec.otp.Hotp;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.ResynchParameters;
 import org.safehaus.profile.ServerProfile;
 import org.safehaus.triplesec.store.DefaultServerProfileStore;
 import org.safehaus.triplesec.store.ServerProfileStore;

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=558849&r1=558848&r2=558849
==============================================================================
--- 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 13:01:54 2007
@@ -42,8 +42,8 @@
 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.apache.directory.triplesec.otp.HotpAttributes;
+import org.apache.directory.triplesec.otp.HotpAttributesCipher;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivationUtils.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivationUtils.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivationUtils.java (original)
+++ directory/triplesec/trunk/webapp-activation/src/main/java/org/safehaus/triplesec/activation/ActivationUtils.java Mon Jul 23 13:01:54 2007
@@ -33,13 +33,13 @@
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
+import org.apache.directory.triplesec.otp.HotpAttributes;
+import org.apache.directory.triplesec.otp.HotpAttributesCipher;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Delete;
 import org.apache.tools.ant.taskdefs.ManifestException;
 import org.apache.tools.ant.taskdefs.Mkdir;
 
-import org.safehaus.otp.HotpAttributes;
-import org.safehaus.otp.HotpAttributesCipher;
 import org.safehaus.triplesec.utils.hauskeys.HauskeysMidletBuilder;
 
 import org.slf4j.Logger;

Modified: directory/triplesec/trunk/webapp-changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/pom.xml (original)
+++ directory/triplesec/trunk/webapp-changelog/pom.xml Mon Jul 23 13:01:54 2007
@@ -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/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ directory/triplesec/trunk/webapp-changelog/src/main/webapp/WEB-INF/faces-config.xml Mon Jul 23 13:01:54 2007
@@ -51,7 +51,7 @@
       The backing data bean
     </description>
     <managed-bean-name>ChangelogController</managed-bean-name>
-    <managed-bean-class>org.safehaus.triplesec.changelogui.ChangelogController</managed-bean-class>
+    <managed-bean-class>org.apache.directory.triplesec.changelogui.ChangelogController</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 

Modified: directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java (original)
+++ directory/triplesec/trunk/webapp-changelog/src/test/java/org/safehaus/triplesec/changelogui/TriplesecChangelogWebappUnit.java Mon Jul 23 13:01:54 2007
@@ -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/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=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-changelog/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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/triplesec/trunk/webapp-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/pom.xml (original)
+++ directory/triplesec/trunk/webapp-config/pom.xml Mon Jul 23 13:01:54 2007
@@ -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/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=558849&r1=558848&r2=558849
==============================================================================
--- 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 13:01:54 2007
@@ -60,7 +60,7 @@
 import org.apache.tools.ant.taskdefs.Delete;
 import org.dom4j.io.OutputFormat;
 
-import org.safehaus.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
 import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilder.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilder.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilder.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilder.java Mon Jul 23 13:01:54 2007
@@ -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/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelFinish.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelFinish.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelFinish.java Mon Jul 23 13:01:54 2007
@@ -30,7 +30,7 @@
 import wicket.Component;
 
 import org.apache.commons.io.FileUtils;
-import org.safehaus.triplesec.TriplesecInstallationLayout;
+import org.apache.directory.triplesec.TriplesecInstallationLayout;
 import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
 import org.safehaus.triplesec.configui.util.TriplesecConfigTool;
 

Modified: directory/triplesec/trunk/webapp-config/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/triplesec/trunk/webapp-config/src/main/webapp/WEB-INF/web.xml Mon Jul 23 13:01:54 2007
@@ -27,7 +27,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/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/RunConfigUI.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/RunConfigUI.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/RunConfigUI.java (original)
+++ directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/RunConfigUI.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.configui;
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunConfigUI extends TriplesecIntegration

Modified: directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilderTest.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilderTest.java (original)
+++ directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilderTest.java Mon Jul 23 13:01:54 2007
@@ -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/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=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-config/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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/triplesec/trunk/webapp-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/pom.xml (original)
+++ directory/triplesec/trunk/webapp-demo/pom.xml Mon Jul 23 13:01:54 2007
@@ -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/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/dao/mock/MockAccountDao.java Mon Jul 23 13:01:54 2007
@@ -19,11 +19,11 @@
  */
 package org.safehaus.triplesec.demo.dao.mock;
 
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
 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 java.util.Iterator;
 import java.util.Map;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/security/AuthenticatedWebSession.java Mon Jul 23 13:01:54 2007
@@ -19,13 +19,13 @@
  */
 package org.safehaus.triplesec.demo.security;
 
+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 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 wicket.protocol.http.WebApplication;
 import wicket.protocol.http.WebSession;
 import wicket.util.string.Strings;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/DefaultPolicyManager.java Mon Jul 23 13:01:54 2007
@@ -19,13 +19,13 @@
  */
 package org.safehaus.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.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.Callback;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/service/PolicyManager.java Mon Jul 23 13:01:54 2007
@@ -19,8 +19,8 @@
  */
 package org.safehaus.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/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/borders/PageBorder.java Mon Jul 23 13:01:54 2007
@@ -19,11 +19,11 @@
  */
 package org.safehaus.triplesec.demo.view.borders;
 
+import org.apache.directory.triplesec.guardian.Profile;
 import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
 import org.safehaus.triplesec.demo.view.pages.HomePage;
 import org.safehaus.triplesec.demo.view.pages.LoginPage;
 import org.safehaus.triplesec.demo.view.pages.AdminPage;
-import org.safehaus.triplesec.guardian.Profile;
 import wicket.markup.html.border.Border;
 import wicket.markup.html.link.Link;
 import wicket.markup.html.basic.Label;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/AdminPage.java Mon Jul 23 13:01:54 2007
@@ -19,13 +19,13 @@
  */
 package org.safehaus.triplesec.demo.view.pages;
 
+import org.apache.directory.triplesec.guardian.Profile;
 import org.safehaus.triplesec.demo.security.AuthenticatedPage;
 import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
 import org.safehaus.triplesec.demo.view.panels.ActionPanel;
 import org.safehaus.triplesec.demo.view.TriplesecDemoApplication;
 import org.safehaus.triplesec.demo.view.ProxyDataProvider;
 import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.guardian.Profile;
 import wicket.markup.html.basic.Label;
 import wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import wicket.extensions.markup.html.repeater.data.table.AbstractColumn;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/pages/HomePage.java Mon Jul 23 13:01:54 2007
@@ -19,6 +19,7 @@
  */
 package org.safehaus.triplesec.demo.view.pages;
 
+import org.apache.directory.triplesec.guardian.Profile;
 import org.safehaus.triplesec.demo.view.ChartResource;
 import org.safehaus.triplesec.demo.dao.AccountDao;
 import org.safehaus.triplesec.demo.model.Account;
@@ -26,7 +27,6 @@
 import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
 import org.safehaus.triplesec.demo.view.TriplesecDemoApplication;
 import org.safehaus.triplesec.demo.view.panels.BuyPanel;
-import org.safehaus.triplesec.guardian.Profile;
 import wicket.Application;
 import wicket.markup.html.basic.Label;
 import wicket.markup.html.image.Image;

Modified: directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/java/org/safehaus/triplesec/demo/view/panels/BuyPanel.java Mon Jul 23 13:01:54 2007
@@ -19,17 +19,17 @@
  */
 package org.safehaus.triplesec.demo.view.panels;
 
+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 org.safehaus.triplesec.demo.dao.AccountDao;
 import org.safehaus.triplesec.demo.model.Account;
 import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
 import org.safehaus.triplesec.demo.service.Registry;
 import org.safehaus.triplesec.demo.view.TriplesecDemoApplication;
 import org.safehaus.triplesec.demo.view.pages.HomePage;
-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 wicket.Application;
 import wicket.markup.html.form.DropDownChoice;
 import wicket.markup.html.form.Form;

Modified: directory/triplesec/trunk/webapp-demo/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/main/resources/applicationContext.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/main/resources/applicationContext.xml (original)
+++ directory/triplesec/trunk/webapp-demo/src/main/resources/applicationContext.xml Mon Jul 23 13:01:54 2007
@@ -6,10 +6,10 @@
 
     <!-- setup wicket application -->
     <bean id="wicketApplication"
-          class="org.safehaus.triplesec.demo.view.TriplesecDemoApplication"/>
+          class="org.apache.directory.triplesec.demo.view.TriplesecDemoApplication"/>
 
     <!-- setup registry bean -->
-    <bean id="registry" class="org.safehaus.triplesec.demo.service.Registry"
+    <bean id="registry" class="org.apache.directory.triplesec.demo.service.Registry"
             factory-method="getInstance">
 
         <property name="policyManager">
@@ -22,10 +22,10 @@
 
     </bean>
 
-    <bean id="policyManager" class="org.safehaus.triplesec.demo.service.DefaultPolicyManager">
+    <bean id="policyManager" class="org.apache.directory.triplesec.demo.service.DefaultPolicyManager">
 
         <property name="ldapDriver">
-            <value>org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver</value>
+            <value>org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver</value>
         </property>
         <property name="url">
             <value>CONNECTION_URL</value>
@@ -42,7 +42,7 @@
 
     </bean>
 
-    <bean id="smsManager" class="org.safehaus.triplesec.demo.service.DefaultSmsManager">
+    <bean id="smsManager" class="org.apache.directory.triplesec.demo.service.DefaultSmsManager">
 
         <property name="smsTransportUrl">
             <value>SMS_TRANSPORT_URL</value>
@@ -67,6 +67,6 @@
     </bean>
 
     <!-- setup dao bean -->
-    <bean id="accountDao" class="org.safehaus.triplesec.demo.dao.mock.MockAccountDao"/>
+    <bean id="accountDao" class="org.apache.directory.triplesec.demo.dao.mock.MockAccountDao"/>
 
 </beans>

Modified: directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java (original)
+++ directory/triplesec/trunk/webapp-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.demo;
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunDemoUI extends TriplesecIntegration

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=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-demo/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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/triplesec/trunk/webapp-registration/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-registration/pom.xml (original)
+++ directory/triplesec/trunk/webapp-registration/pom.xml Mon Jul 23 13:01:54 2007
@@ -135,7 +135,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>
@@ -160,15 +160,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>registration</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.registration</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.registration</name>
                   <value>${basedir}/target/tsec-registration.war</value>
                 </property>
               </systemProperties>

Modified: directory/triplesec/trunk/webapp-registration/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/webapp/WEB-INF/web.xml Mon Jul 23 13:01:54 2007
@@ -28,7 +28,7 @@
     <servlet-class>wicket.protocol.http.WicketServlet</servlet-class>
     <init-param>
       <param-name>applicationClassName</param-name>
-      <param-value>org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication</param-value>
+      <param-value>org.apache.directory.triplesec.registration.view.TriplesecRegistrationApplication</param-value>
     </init-param>
     
     <!-- Init Parameters for LDAP Connectivity -->

Modified: directory/triplesec/trunk/webapp-registration/src/test/java/org/safehaus/triplesec/registration/RunRegistrationUI.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/test/java/org/safehaus/triplesec/registration/RunRegistrationUI.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/test/java/org/safehaus/triplesec/registration/RunRegistrationUI.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/test/java/org/safehaus/triplesec/registration/RunRegistrationUI.java Mon Jul 23 13:01:54 2007
@@ -20,7 +20,7 @@
 package org.safehaus.triplesec.registration;
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunRegistrationUI extends TriplesecIntegration

Modified: directory/triplesec/trunk/webapp-registration/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/test/resources/server.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-registration/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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/triplesec/trunk/webapp-servlet-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/pom.xml (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/pom.xml Mon Jul 23 13:01:54 2007
@@ -107,7 +107,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>
@@ -132,15 +132,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/triplesec-servlet-demo.war</value>
                 </property>
               </systemProperties>

Modified: directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginCommand.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginCommand.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginCommand.java (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginCommand.java Mon Jul 23 13:01:54 2007
@@ -29,12 +29,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 
 /**

Modified: directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginServlet.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginServlet.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginServlet.java (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/src/main/java/org/safehaus/triplesec/demo/LoginServlet.java Mon Jul 23 13:01:54 2007
@@ -32,12 +32,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.Permissions;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Roles;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.Permissions;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Roles;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 
 /**
@@ -80,7 +80,7 @@
         props.setProperty( "applicationCredentials", applicationCredentials );
         try
         {
-            Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+            Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
             policy = ApplicationPolicyFactory.newInstance( connectionUrl, props );
         }
         catch ( Exception e )

Modified: directory/triplesec/trunk/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml Mon Jul 23 13:01:54 2007
@@ -3,7 +3,7 @@
 <web-app>
   <servlet>
     <servlet-name>LoginServlet</servlet-name>
-    <servlet-class>org.safehaus.triplesec.demo.LoginServlet</servlet-class>
+    <servlet-class>org.apache.directory.triplesec.demo.LoginServlet</servlet-class>
     <init-param>
     	<param-name>realm</param-name>
     	<param-value>EXAMPLE.COM</param-value>

Modified: directory/triplesec/trunk/webapp-servlet-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/src/test/java/org/safehaus/triplesec/demo/RunDemoUI.java Mon Jul 23 13:01:54 2007
@@ -21,7 +21,7 @@
 
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunDemoUI extends TriplesecIntegration

Modified: directory/triplesec/trunk/webapp-servlet-demo/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-servlet-demo/src/test/resources/server.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-servlet-demo/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-servlet-demo/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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/triplesec/trunk/webapp-wicket-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/pom.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/pom.xml (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/pom.xml Mon Jul 23 13:01:54 2007
@@ -120,7 +120,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>
@@ -145,15 +145,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>admin</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.admin</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.admin</name>
                   <value>${basedir}/target/tsec-wicket-admin.war</value>
                 </property>
               </systemProperties>

Modified: directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/AuthenticatedWebSession.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/AuthenticatedWebSession.java (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/AuthenticatedWebSession.java Mon Jul 23 13:01:54 2007
@@ -28,7 +28,7 @@
  * Basic authenticated web session.  Subclasses must provide an implementation
  * of the <code>authenticate</code> method based on connection and credential
  * information contained within an instance of the
- * {@link org.safehaus.triplesec.adminui.models.ConnectionInfo} bean.
+ * {@link org.apache.directory.triplesec.adminui.models.ConnectionInfo} bean.
  */
 public class AuthenticatedWebSession extends WebSession
 {
@@ -51,7 +51,7 @@
 
     /**
      * Authenticates this session to the Triplesec server using the given
-     * {@link org.safehaus.triplesec.adminui.models.ConnectionInfo} properties.
+     * {@link org.apache.directory.triplesec.adminui.models.ConnectionInfo} properties.
      *
      * @param info the <code>ConnectionInfo</code> properties
      * @return <code>true</code> if the user was authenticated successfully

Modified: directory/triplesec/trunk/webapp-wicket-admin/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/src/main/webapp/WEB-INF/web.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/src/main/webapp/WEB-INF/web.xml Mon Jul 23 13:01:54 2007
@@ -30,7 +30,7 @@
     <servlet-class>wicket.protocol.http.WicketServlet</servlet-class>
     <init-param>
       <param-name>applicationClassName</param-name>
-      <param-value>org.safehaus.triplesec.adminui.view.TriplesecAdminApplication</param-value>
+      <param-value>org.apache.directory.triplesec.adminui.view.TriplesecAdminApplication</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>

Modified: directory/triplesec/trunk/webapp-wicket-admin/src/test/java/org/safehaus/triplesec/wicket/admin/RunWicketAdminUI.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/src/test/java/org/safehaus/triplesec/wicket/admin/RunWicketAdminUI.java?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/src/test/java/org/safehaus/triplesec/wicket/admin/RunWicketAdminUI.java (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/src/test/java/org/safehaus/triplesec/wicket/admin/RunWicketAdminUI.java Mon Jul 23 13:01:54 2007
@@ -21,7 +21,7 @@
 
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunWicketAdminUI extends TriplesecIntegration

Modified: directory/triplesec/trunk/webapp-wicket-admin/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-wicket-admin/src/test/resources/server.xml?view=diff&rev=558849&r1=558848&r2=558849
==============================================================================
--- directory/triplesec/trunk/webapp-wicket-admin/src/test/resources/server.xml (original)
+++ directory/triplesec/trunk/webapp-wicket-admin/src/test/resources/server.xml Mon Jul 23 13:01:54 2007
@@ -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,7 +37,7 @@
 
         <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>
@@ -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>



Mime
View raw message