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

[dj...@apache.org]

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/webapp/WEB-INF/web.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/main/webapp/WEB-INF/web.xml Fri Aug 10 00:58:38 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/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/RunConfigUI.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java Fri Aug 10 00:58:38 2007
@@ -17,15 +17,15 @@
  *  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 org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
 
 import junit.framework.TestCase;
 

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/pom.xml Fri Aug 10 00:58:38 2007
@@ -158,7 +158,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>
@@ -183,15 +183,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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/AccountDao.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/InvestmentsDao.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/QueryParam.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/jdbc/JdbcInvestmentsDao.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/dao/mock/MockAccountDao.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Account.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/model/Investments.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedPage.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/AuthenticatedWebSession.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/security/PageAuthorizationStrategy.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultPolicyManager.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/DefaultSmsManager.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/PolicyManager.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/Registry.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/service/SmsManager.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDataProvider.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/AccountDetachableModel.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ChartResource.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyDataProvider.java Fri Aug 10 00:58:38 2007
@@ -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/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/ProxyModel.java Fri Aug 10 00:58:38 2007
@@ -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
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java Fri Aug 10 00:58:38 2007
@@ -17,16 +17,16 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view;
+package org.apache.directory.triplesec.demo.view;
 
 
-import org.safehaus.triplesec.demo.security.AuthenticatedPage;
-import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
-import org.safehaus.triplesec.demo.security.PageAuthorizationStrategy;
-import org.safehaus.triplesec.demo.view.pages.HomePage;
-import org.safehaus.triplesec.demo.view.pages.LoginPage;
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.demo.security.AuthenticatedPage;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.security.PageAuthorizationStrategy;
+import org.apache.directory.triplesec.demo.view.pages.HomePage;
+import org.apache.directory.triplesec.demo.view.pages.LoginPage;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.service.Registry;
 import wicket.ISessionFactory;
 import wicket.Session;
 import wicket.spring.SpringWebApplication;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java Fri Aug 10 00:58:38 2007
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.borders;
+package org.apache.directory.triplesec.demo.view.borders;
 
-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 org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.view.pages.HomePage;
+import org.apache.directory.triplesec.demo.view.pages.LoginPage;
+import org.apache.directory.triplesec.demo.view.pages.AdminPage;
+import org.apache.directory.triplesec.guardian.Profile;
 import wicket.markup.html.border.Border;
 import wicket.markup.html.link.Link;
 import wicket.markup.html.basic.Label;

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java Fri Aug 10 00:58:38 2007
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.pages;
+package org.apache.directory.triplesec.demo.view.pages;
 
-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 org.apache.directory.triplesec.demo.security.AuthenticatedPage;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.view.panels.ActionPanel;
+import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication;
+import org.apache.directory.triplesec.demo.view.ProxyDataProvider;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.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/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.pages;
+package org.apache.directory.triplesec.demo.view.pages;
 
 import wicket.markup.html.WebPage;
 import wicket.markup.html.border.Border;
-import org.safehaus.triplesec.demo.view.borders.PageBorder;
+import org.apache.directory.triplesec.demo.view.borders.PageBorder;
 
 /**
  * Abstract base class for (most) all pages in the application.  It will

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java Fri Aug 10 00:58:38 2007
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.pages;
+package org.apache.directory.triplesec.demo.view.pages;
 
-import org.safehaus.triplesec.demo.view.ChartResource;
-import org.safehaus.triplesec.demo.model.Account;
-import org.safehaus.triplesec.demo.security.AuthenticatedPage;
+import org.apache.directory.triplesec.demo.view.ChartResource;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.security.AuthenticatedPage;
 import wicket.markup.html.image.Image;
 
 public class ChartPage extends BasePage implements AuthenticatedPage

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java Fri Aug 10 00:58:38 2007
@@ -17,16 +17,16 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.pages;
+package org.apache.directory.triplesec.demo.view.pages;
 
-import org.safehaus.triplesec.demo.view.ChartResource;
-import org.safehaus.triplesec.demo.dao.AccountDao;
-import org.safehaus.triplesec.demo.model.Account;
-import org.safehaus.triplesec.demo.security.AuthenticatedPage;
-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 org.apache.directory.triplesec.demo.view.ChartResource;
+import org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.security.AuthenticatedPage;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication;
+import org.apache.directory.triplesec.demo.view.panels.BuyPanel;
+import org.apache.directory.triplesec.guardian.Profile;
 import wicket.Application;
 import wicket.markup.html.basic.Label;
 import wicket.markup.html.image.Image;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java Fri Aug 10 00:58:38 2007
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.pages;
+package org.apache.directory.triplesec.demo.view.pages;
 
-import org.safehaus.triplesec.demo.view.panels.LoginPanel;
-import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.view.panels.LoginPanel;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
 
 
 public class LoginPage extends BasePage

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java Fri Aug 10 00:58:38 2007
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.panels;
+package org.apache.directory.triplesec.demo.view.panels;
 
-import org.safehaus.triplesec.demo.model.Account;
-import org.safehaus.triplesec.demo.view.pages.ChartPage;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.view.pages.ChartPage;
 import wicket.markup.html.link.Link;
 import wicket.markup.html.panel.Panel;
 import wicket.model.IModel;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.panels;
+package org.apache.directory.triplesec.demo.view.panels;
 
 import wicket.markup.html.panel.Panel;
 import wicket.model.IModel;
 import wicket.model.Model;
-import org.safehaus.triplesec.demo.view.borders.PanelBorder;
+import org.apache.directory.triplesec.demo.view.borders.PanelBorder;
 
 public class BasePanel extends Panel
 {

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java Fri Aug 10 00:58:38 2007
@@ -17,19 +17,19 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.panels;
+package org.apache.directory.triplesec.demo.view.panels;
 
-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 org.apache.directory.triplesec.demo.dao.AccountDao;
+import org.apache.directory.triplesec.demo.model.Account;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication;
+import org.apache.directory.triplesec.demo.view.pages.HomePage;
+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.Application;
 import wicket.markup.html.form.DropDownChoice;
 import wicket.markup.html.form.Form;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java Fri Aug 10 00:58:38 2007
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.panels;
+package org.apache.directory.triplesec.demo.view.panels;
 
-import org.safehaus.triplesec.demo.security.AuthenticatedWebSession;
-import org.safehaus.triplesec.demo.view.TriplesecDemoApplication;
-import org.safehaus.triplesec.demo.view.pages.WapPushPage;
-import org.safehaus.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.demo.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.demo.view.TriplesecDemoApplication;
+import org.apache.directory.triplesec.demo.view.pages.WapPushPage;
+import org.apache.directory.triplesec.demo.service.Registry;
 import wicket.markup.html.basic.Label;
 import wicket.markup.html.form.Button;
 import wicket.markup.html.form.Form;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo.view.panels;
+package org.apache.directory.triplesec.demo.view.panels;
 
 
 import wicket.markup.html.link.Link;
@@ -29,8 +29,8 @@
 import wicket.model.CompoundPropertyModel;
 import wicket.model.Model;
 import wicket.util.parse.metapattern.MetaPattern;
-import org.safehaus.triplesec.demo.view.pages.HomePage;
-import org.safehaus.triplesec.demo.service.Registry;
+import org.apache.directory.triplesec.demo.view.pages.HomePage;
+import org.apache.directory.triplesec.demo.service.Registry;
 
 import java.util.List;
 import java.util.Arrays;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/applicationContext.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/applicationContext.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/main/resources/applicationContext.xml Fri Aug 10 00:58:38 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/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java Fri Aug 10 00:58:38 2007
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo;
+package org.apache.directory.triplesec.demo;
 
 
-import org.safehaus.triplesec.integration.TriplesecIntegration;
+import org.apache.directory.triplesec.integration.TriplesecIntegration;
 
 
 public class RunDemoUI extends TriplesecIntegration

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java Fri Aug 10 00:58:38 2007
@@ -21,9 +21,9 @@
 
 import junit.framework.TestCase;
 import org.apache.derby.jdbc.EmbeddedDriver;
-import org.safehaus.triplesec.demo.dao.InvestmentsDao;
-import org.safehaus.triplesec.demo.dao.jdbc.JdbcInvestmentsDao;
-import org.safehaus.triplesec.demo.model.Investments;
+import org.apache.directory.triplesec.demo.dao.InvestmentsDao;
+import org.apache.directory.triplesec.demo.dao.jdbc.JdbcInvestmentsDao;
+import org.apache.directory.triplesec.demo.model.Investments;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-registration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/pom.xml?view=diff&rev=564501&r1=564500&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/pom.xml Fri Aug 10 00:58:38 2007
@@ -165,7 +165,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>
@@ -190,15 +190,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/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.model;
+package org.apache.directory.triplesec.registration.model;
 
 
 import java.io.Serializable;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java Fri Aug 10 00:58:38 2007
@@ -17,17 +17,17 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view;
+package org.apache.directory.triplesec.registration.view;
 
 
 import java.util.Properties;
 
 import javax.naming.Context;
 
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
-import org.safehaus.triplesec.registration.view.pages.WizardPage;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.registration.view.pages.WizardPage;
 import wicket.protocol.http.WebApplication;
 
 

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view;
+package org.apache.directory.triplesec.registration.view;
 
 
 import wicket.examples.wizard.ezwizard.impl.Wizard;
@@ -25,9 +25,9 @@
 import wicket.examples.wizard.ezwizard.intf.IWizardStep;
 import wicket.util.string.Strings;
 
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.NoSuchEntryException;
-import org.safehaus.triplesec.registration.model.RegistrationInfo;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.NoSuchEntryException;
+import org.apache.directory.triplesec.registration.model.RegistrationInfo;
 
 
 /**

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

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

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

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java Fri Aug 10 00:58:38 2007
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view.pages;
+package org.apache.directory.triplesec.registration.view.pages;
 
 
-import org.safehaus.triplesec.registration.model.RegistrationInfo;
-import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication;
-import org.safehaus.triplesec.registration.view.TriplesecRegistrationWizard;
-import org.safehaus.triplesec.registration.view.panels.*;
+import org.apache.directory.triplesec.registration.model.RegistrationInfo;
+import org.apache.directory.triplesec.registration.view.TriplesecRegistrationApplication;
+import org.apache.directory.triplesec.registration.view.TriplesecRegistrationWizard;
+import org.apache.directory.triplesec.registration.view.panels.*;
 
 import wicket.model.IModel;
 import wicket.model.CompoundPropertyModel;

Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java?view=diff&rev=564501&r1=564498&r2=564501
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java Fri Aug 10 00:58:38 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view.panels;
+package org.apache.directory.triplesec.registration.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.registration.view.borders.WizardPanelBorder;
-import org.safehaus.triplesec.registration.view.pages.WizardPage;
+import org.apache.directory.triplesec.registration.view.borders.WizardPanelBorder;
+import org.apache.directory.triplesec.registration.view.pages.WizardPage;
 
 /**
  * Wizard steps are usually derived from a panel, and implement

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

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