svn commit: r559095 [3/3] - in /directory/triplesec/trunk: configuration-io/src/test/java/org/apache/directory/triplesec/configuration/ main/src/main/java/org/apache/directory/triplesec/ profile/src/main/java/org/apache/ profile/src/main/java/org/apach...

[ck...@apache.org]

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java (from r559009, 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/apache/directory/triplesec/configui/util/TriplesecConfigTool.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecConfigTool.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecConfigTool.java&r2=559095
==============================================================================
--- 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/apache/directory/triplesec/configui/util/TriplesecConfigTool.java Tue Jul 24 09:27:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.io.File;
@@ -48,6 +48,7 @@
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.util.Base64;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 import org.apache.directory.triplesec.configuration.ContextParameter;
 import org.apache.directory.triplesec.configuration.FilterConfiguration;
 import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
@@ -61,7 +62,6 @@
 import org.dom4j.io.OutputFormat;
 
 import org.apache.directory.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java (from r559009, 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/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilder.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java&r2=559095
==============================================================================
--- 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/apache/directory/triplesec/configui/util/TriplesecPropBuilder.java Tue Jul 24 09:27:10 2007
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.util;
+package org.apache.directory.triplesec.configui.util;
 
 
 import java.util.Properties;
 
 import org.apache.directory.shared.ldap.util.NamespaceTools;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 
 
 /**

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java (from r558850, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigApplication.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigApplication.java&r1=558850&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigApplication.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigApplication.java Tue Jul 24 09:27:10 2007
@@ -17,11 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view;
+package org.apache.directory.triplesec.configui.view;
 
 
 import wicket.protocol.http.WebApplication;
-import org.safehaus.triplesec.configui.view.pages.WizardPage;
+
+import org.apache.directory.triplesec.configui.view.pages.WizardPage;
 
 public class TriplesecConfigApplication extends WebApplication
 {

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java (from r558850, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigWizard.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigWizard.java&r1=558850&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/TriplesecConfigWizard.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/TriplesecConfigWizard.java Tue Jul 24 09:27:10 2007
@@ -17,14 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view;
+package org.apache.directory.triplesec.configui.view;
 
 import wicket.examples.wizard.ezwizard.impl.Wizard;
 import wicket.examples.wizard.ezwizard.impl.WizardTransition;
 import wicket.examples.wizard.ezwizard.intf.IWizardStep;
 import wicket.util.string.Strings;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configui.util.CertificateUtil;
+
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.util.CertificateUtil;
 
 import java.io.File;
 

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/AppPageBorder.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/AppPageBorder.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/AppPageBorder.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/AppPageBorder.java Tue Jul 24 09:27:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.borders;
+package org.apache.directory.triplesec.configui.view.borders;
 
 
 import wicket.markup.html.border.Border;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/WizardPanelBorder.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/WizardPanelBorder.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/borders/WizardPanelBorder.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/borders/WizardPanelBorder.java Tue Jul 24 09:27:10 2007
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.borders;
+package org.apache.directory.triplesec.configui.view.borders;
 
 
 import wicket.markup.html.border.Border;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/BasePage.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/BasePage.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/BasePage.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/BasePage.java Tue Jul 24 09:27:10 2007
@@ -17,11 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.configui.view.pages;
+package org.apache.directory.triplesec.configui.view.pages;
 
 import wicket.markup.html.WebPage;
 import wicket.markup.html.border.Border;
-import org.safehaus.triplesec.configui.view.borders.AppPageBorder;
+
+import org.apache.directory.triplesec.configui.view.borders.AppPageBorder;
 
 public abstract class BasePage extends WebPage
 {

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/WizardPage.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/WizardPage.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/pages/WizardPage.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/pages/WizardPage.java Tue Jul 24 09:27:10 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.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.view.TriplesecConfigWizard;
+import org.apache.directory.triplesec.configui.view.panels.*;
 import wicket.model.IModel;
 import wicket.model.CompoundPropertyModel;
 import wicket.protocol.http.WebApplication;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanel.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanel.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanel.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanel.java Tue Jul 24 09:27:10 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

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelAdmin.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelAdmin.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelAdmin.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelAdmin.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelDemo.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelDemo.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelDemo.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelDemo.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java (from r559009, 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/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelFinish.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java&r2=559095
==============================================================================
--- 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/apache/directory/triplesec/configui/view/panels/WizardPanelFinish.java Tue Jul 24 09:27:10 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;
@@ -31,8 +31,8 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.triplesec.TriplesecInstallationLayout;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
-import org.safehaus.triplesec.configui.util.TriplesecConfigTool;
+import org.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
+import org.apache.directory.triplesec.configui.util.TriplesecConfigTool;
 
 
 public class WizardPanelFinish extends WizardPanel

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelIntro.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelIntro.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelIntro.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelIntro.java Tue Jul 24 09:27:10 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;
 

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelLdap.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelLdap.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelLdap.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelLdap.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelRealm.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelRealm.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelRealm.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelRealm.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSecureLdap.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSecureLdap.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSecureLdap.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSecureLdap.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSms.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSms.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSms.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSms.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSmtp.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSmtp.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelSmtp.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelSmtp.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java (from r559009, directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelUser.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelUser.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/main/java/org/safehaus/triplesec/configui/view/panels/WizardPanelUser.java (original)
+++ directory/triplesec/trunk/webapp-config/src/main/java/org/apache/directory/triplesec/configui/view/panels/WizardPanelUser.java Tue Jul 24 09:27:10 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;

Copied: directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java (from r559009, directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/CertificateUtilTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/CertificateUtilTest.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/CertificateUtilTest.java (original)
+++ directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/CertificateUtilTest.java Tue Jul 24 09:27:10 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;
 

Copied: directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java (from r559009, directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java)
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecConfigBuilderTest.java (original)
+++ directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecConfigBuilderTest.java Tue Jul 24 09:27:10 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.apache.directory.triplesec.configui.model.TriplesecConfigSettings;
 import org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration;
-import org.safehaus.triplesec.configui.model.TriplesecConfigSettings;
 
 import junit.framework.TestCase;
 

Copied: directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java (from r559009, 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/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java?view=diff&rev=559095&p1=directory/triplesec/trunk/webapp-config/src/test/java/org/safehaus/triplesec/configui/util/TriplesecPropBuilderTest.java&r1=559009&p2=directory/triplesec/trunk/webapp-config/src/test/java/org/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java&r2=559095
==============================================================================
--- 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/apache/directory/triplesec/configui/util/TriplesecPropBuilderTest.java Tue Jul 24 09:27:10 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;
 

Modified: directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java?view=diff&rev=559095&r1=559094&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelDeploy.java Tue Jul 24 09:27:10 2007
@@ -23,7 +23,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.safehaus.sms.Carrier;
+import org.apache.directory.triplesec.sms.Carrier;
 
 import wicket.markup.html.form.DropDownChoice;
 import wicket.markup.html.form.PasswordTextField;

Modified: directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java?view=diff&rev=559095&r1=559094&r2=559095
==============================================================================
--- directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java (original)
+++ directory/triplesec/trunk/webapp-registration/src/main/java/org/safehaus/triplesec/registration/view/panels/WizardPanelFinish.java Tue Jul 24 09:27:10 2007
@@ -44,7 +44,7 @@
 import org.apache.directory.triplesec.admin.TriplesecAdmin;
 import org.apache.directory.triplesec.configuration.SmsConfiguration;
 import org.apache.directory.triplesec.configuration.SmtpConfiguration;
-import org.safehaus.sms.Carrier;
+import org.apache.directory.triplesec.sms.Carrier;
 import org.safehaus.triplesec.registration.model.RegistrationInfo;
 import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication;