directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r491261 [7/8] - in /directory/sandbox/triplesec-jacc: ./ admin-api/ admin-api/src/main/java/org/apache/ admin-api/src/main/java/org/apache/directory/ admin-api/src/main/java/org/apache/directory/triplesec/ admin-api/src/main/java/org/apache...
Date Sat, 30 Dec 2006 18:01:04 GMT
Modified: directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/TriplesecDemoApplication.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PageBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/borders/PanelBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/AdminPage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/BasePage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/ChartPage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/HomePage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/LoginPage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/pages/WapPushPage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/ActionPanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BasePanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/BuyPanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/LoginPanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/java/org/apache/directory/triplesec/demo/view/panels/WapPushPanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/main/resources/applicationContext.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/main/resources/applicationContext.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/main/resources/applicationContext.xml Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/apache/directory/triplesec/demo/RunDemoUI.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/test/java/org/safehaus/demo/JdbcInvestmentsTest.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-demo/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-demo/src/test/resources/server.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-demo/src/test/resources/server.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-demo/src/test/resources/server.xml Sat Dec 30 10:00:46 2006
@@ -11,8 +11,8 @@
         <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
         <prop key="java.naming.security.credentials">secret</prop>
         <prop key="java.naming.provider.url">dc=example,dc=com</prop>
-        <prop key="java.naming.factory.state">org.safehaus.triplesec.store.ProfileStateFactory</prop>
-        <prop key="java.naming.factory.object">org.safehaus.triplesec.store.ProfileObjectFactory</prop>
+        <prop key="java.naming.factory.state">org.apache.directory.triplesec.store.ProfileStateFactory</prop>
+        <prop key="java.naming.factory.object">org.apache.directory.triplesec.store.ProfileObjectFactory</prop>
 
         <prop key="kdc.primary.realm">EXAMPLE.COM</prop>
         <prop key="kdc.principal">krbtgt/EXAMPLE.COM@EXAMPLE.COM</prop>
@@ -37,12 +37,12 @@
 
         <prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
         <prop key="safehaus.load.testdata">true</prop>
-        <prop key="kerberos.sam.type.7">org.safehaus.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
+        <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>
   </bean>
 
-  <bean id="configuration" class="org.safehaus.triplesec.configuration.MutableTriplesecStartupConfiguration">
+  <bean id="configuration" class="org.apache.directory.triplesec.configuration.MutableTriplesecStartupConfiguration">
     <property name="workingDirectory"><value>partitions</value></property>
     <property name="allowAnonymousAccess"><value>false</value></property>
     <property name="accessControlEnabled"><value>true</value></property>
@@ -76,7 +76,7 @@
     </property>
 
     <property name="activationConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.ActivationConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.ActivationConfiguration">
         <property name="enableDecoyMidlet"><value>true</value></property>
         <property name="otpLength"><value>6</value></property>
         <property name="midletNameAttribute"><value>midletNameAttribute</value></property>
@@ -84,7 +84,7 @@
     </property>    
     
     <property name="smsConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmsConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmsConfiguration">
         <property name="smsUsername"><value>hauskeys</value></property>
         <property name="smsPassword"><value>secret</value></property>
         <property name="smsAccountName"><value>demo</value></property>
@@ -93,7 +93,7 @@
     </property>    
     
     <property name="smtpConfiguration">
-      <bean class="org.safehaus.triplesec.configuration.SmtpConfiguration">
+      <bean class="org.apache.directory.triplesec.configuration.SmtpConfiguration">
         <property name="smtpAuthenticate"><value>false</value></property>
         <!-- uncomment and set above property if authentication is required by mail server
              <property name="smtpUsername"><value>hauskeys</value></property>
@@ -121,7 +121,7 @@
         <bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
         <bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
         <bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
-        <bean class="org.safehaus.triplesec.store.schema.SafehausSchema"/>
+        <bean class="org.apache.directory.triplesec.store.schema.SafehausSchema"/>
       </set>
     </property>
     
@@ -203,7 +203,7 @@
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name"><value>policyProtectionService</value></property>
           <property name="interceptor">
-            <bean class="org.safehaus.triplesec.store.interceptor.PolicyProtectionInterceptor" />
+            <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
           </property>
         </bean>
       </list>

Modified: directory/sandbox/triplesec-jacc/webapp-registration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/pom.xml Sat Dec 30 10:00:46 2006
@@ -135,7 +135,7 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
               </systemProperties>
@@ -160,15 +160,15 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webapps</name>
+                  <name>org.apache.directory.triplesec.integration.webapps</name>
                   <value>registration</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.registration</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.registration</name>
                   <value>${basedir}/target/tsec-registration.war</value>
                 </property>
               </systemProperties>

Modified: directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/model/RegistrationInfo.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationApplication.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view;
+package org.apache.directory.triplesec.registration.view;
 
 
 import java.util.Properties;
@@ -26,12 +26,12 @@
 
 import wicket.protocol.http.WebApplication;
 
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
-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.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.registration.view.pages.WizardPage;
 
 
 public class TriplesecRegistrationApplication extends WebApplication

Modified: directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/TriplesecRegistrationWizard.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/AppPageBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/borders/WizardPanelBorder.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/BasePage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/pages/WizardPage.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanel.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelAddress.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelDeploy.java Sat Dec 30 10:00:46 2006
@@ -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/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelFinish.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.registration.view.panels;
+package org.apache.directory.triplesec.registration.view.panels;
 
  
 import java.io.IOException;
@@ -38,15 +38,15 @@
 import org.apache.commons.lang.math.RandomUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.safehaus.sms.Carrier;
-import org.safehaus.triplesec.admin.Application;
-import org.safehaus.triplesec.admin.DataAccessException;
-import org.safehaus.triplesec.admin.HauskeysUser;
-import org.safehaus.triplesec.admin.HauskeysUserModifier;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.configuration.SmsConfiguration;
-import org.safehaus.triplesec.configuration.SmtpConfiguration;
-import org.safehaus.triplesec.registration.model.RegistrationInfo;
-import org.safehaus.triplesec.registration.view.TriplesecRegistrationApplication;
+import org.apache.directory.triplesec.admin.Application;
+import org.apache.directory.triplesec.admin.DataAccessException;
+import org.apache.directory.triplesec.admin.HauskeysUser;
+import org.apache.directory.triplesec.admin.HauskeysUserModifier;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.configuration.SmsConfiguration;
+import org.apache.directory.triplesec.configuration.SmtpConfiguration;
+import org.apache.directory.triplesec.registration.model.RegistrationInfo;
+import org.apache.directory.triplesec.registration.view.TriplesecRegistrationApplication;
 
 import com.sun.mail.smtp.SMTPTransport;
 

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

Modified: directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelUser.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelUser.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelUser.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-registration/src/main/java/org/apache/directory/triplesec/registration/view/panels/WizardPanelUser.java Sat Dec 30 10:00:46 2006
@@ -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.form.PasswordTextField;

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

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

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

Modified: directory/sandbox/triplesec-jacc/webapp-servlet-demo/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-servlet-demo/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-servlet-demo/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-servlet-demo/pom.xml Sat Dec 30 10:00:46 2006
@@ -107,7 +107,7 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
               </systemProperties>
@@ -132,15 +132,15 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webapps</name>
+                  <name>org.apache.directory.triplesec.integration.webapps</name>
                   <value>demo</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.demo</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.demo</name>
                   <value>${basedir}/target/triplesec-servlet-demo.war</value>
                 </property>
               </systemProperties>

Modified: directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginCommand.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginCommand.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginCommand.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo;
+package org.apache.directory.triplesec.demo;
 
 
 import javax.security.auth.spi.LoginModule;
@@ -29,12 +29,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.jaas.PasscodeCallback;
-import org.safehaus.triplesec.jaas.PolicyCallback;
-import org.safehaus.triplesec.jaas.RealmCallback;
-import org.safehaus.triplesec.jaas.SafehausLoginModule;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.jaas.PasscodeCallback;
+import org.apache.directory.triplesec.jaas.PolicyCallback;
+import org.apache.directory.triplesec.jaas.RealmCallback;
+import org.apache.directory.triplesec.jaas.SafehausLoginModule;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 
 /**

Modified: directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginServlet.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginServlet.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginServlet.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/java/org/apache/directory/triplesec/demo/LoginServlet.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.demo;
+package org.apache.directory.triplesec.demo;
 
 
 import java.io.IOException;
@@ -35,11 +35,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.safehaus.triplesec.guardian.ApplicationPolicy;
-import org.safehaus.triplesec.guardian.ApplicationPolicyFactory;
-import org.safehaus.triplesec.guardian.Profile;
-import org.safehaus.triplesec.guardian.Roles;
-import org.safehaus.triplesec.jaas.SafehausPrincipal;
+import org.apache.directory.triplesec.guardian.ApplicationPolicy;
+import org.apache.directory.triplesec.guardian.ApplicationPolicyFactory;
+import org.apache.directory.triplesec.guardian.Profile;
+import org.apache.directory.triplesec.guardian.Roles;
+import org.apache.directory.triplesec.jaas.SafehausPrincipal;
 
 
 /**
@@ -82,7 +82,7 @@
         props.setProperty( "applicationCredentials", applicationCredentials );
         try
         {
-            Class.forName( "org.safehaus.triplesec.guardian.ldap.LdapConnectionDriver" );
+            Class.forName( "org.apache.directory.triplesec.guardian.ldap.LdapConnectionDriver" );
             policy = ApplicationPolicyFactory.newInstance( connectionUrl, props );
         }
         catch ( Exception e )

Modified: directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-servlet-demo/src/main/webapp/WEB-INF/web.xml Sat Dec 30 10:00:46 2006
@@ -3,7 +3,7 @@
 <web-app>
   <servlet>
     <servlet-name>LoginServlet</servlet-name>
-    <servlet-class>org.safehaus.triplesec.demo.LoginServlet</servlet-class>
+    <servlet-class>org.apache.directory.triplesec.demo.LoginServlet</servlet-class>
     <init-param>
     	<param-name>realm</param-name>
     	<param-value>EXAMPLE.COM</param-value>

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

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/pom.xml?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/pom.xml (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/pom.xml Sat Dec 30 10:00:46 2006
@@ -120,7 +120,7 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
               </systemProperties>
@@ -145,15 +145,15 @@
             <configuration>
               <systemProperties>
                 <property>
-                  <name>org.safehaus.triplesec.integration.resourcesDirectory</name>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
                   <value>${basedir}/src/test/resources</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webapps</name>
+                  <name>org.apache.directory.triplesec.integration.webapps</name>
                   <value>admin</value>
                 </property>
                 <property>
-                  <name>org.safehaus.triplesec.integration.webappWarBase.admin</name>
+                  <name>org.apache.directory.triplesec.integration.webappWarBase.admin</name>
                   <value>${basedir}/target/tsec-wicket-admin.war</value>
                 </property>
               </systemProperties>

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

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

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/security/AuthenticatedWebSession.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/security/AuthenticatedWebSession.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/security/AuthenticatedWebSession.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/security/AuthenticatedWebSession.java Sat Dec 30 10:00:46 2006
@@ -17,18 +17,18 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.security;
+package org.apache.directory.triplesec.adminui.security;
 
 import wicket.protocol.http.WebApplication;
 import wicket.protocol.http.WebSession;
-import org.safehaus.triplesec.adminui.models.ConnectionInfo;
-import org.safehaus.triplesec.adminui.services.ConnectionManager;
+import org.apache.directory.triplesec.adminui.models.ConnectionInfo;
+import org.apache.directory.triplesec.adminui.services.ConnectionManager;
 
 /**
  * Basic authenticated web session.  Subclasses must provide an implementation
  * of the <code>authenticate</code> method based on connection and credential
  * information contained within an instance of the
- * {@link org.safehaus.triplesec.adminui.models.ConnectionInfo} bean.
+ * {@link org.apache.directory.triplesec.adminui.models.ConnectionInfo} bean.
  */
 public class AuthenticatedWebSession extends WebSession
 {
@@ -51,7 +51,7 @@
 
     /**
      * Authenticates this session to the Triplesec server using the given
-     * {@link org.safehaus.triplesec.adminui.models.ConnectionInfo} properties.
+     * {@link org.apache.directory.triplesec.adminui.models.ConnectionInfo} properties.
      *
      * @param info the <code>ConnectionInfo</code> properties
      * @return <code>true</code> if the user was authenticated successfully

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

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/services/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/services/ConnectionManager.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/services/ConnectionManager.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/services/ConnectionManager.java Sat Dec 30 10:00:46 2006
@@ -17,15 +17,15 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.services;
+package org.apache.directory.triplesec.adminui.services;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.safehaus.triplesec.admin.TriplesecAdmin;
-import org.safehaus.triplesec.admin.dao.DaoFactory;
-import org.safehaus.triplesec.admin.dao.ldap.LdapDaoFactory;
-import org.safehaus.triplesec.adminui.models.ConnectionInfo;
-import org.safehaus.triplesec.configuration.TriplesecStartupConfiguration;
+import org.apache.directory.triplesec.admin.TriplesecAdmin;
+import org.apache.directory.triplesec.admin.dao.DaoFactory;
+import org.apache.directory.triplesec.admin.dao.ldap.LdapDaoFactory;
+import org.apache.directory.triplesec.adminui.models.ConnectionInfo;
+import org.apache.directory.triplesec.configuration.TriplesecStartupConfiguration;
 
 import javax.naming.Context;
 import java.util.Observable;

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/TriplesecAdminApplication.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/TriplesecAdminApplication.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/TriplesecAdminApplication.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/TriplesecAdminApplication.java Sat Dec 30 10:00:46 2006
@@ -17,13 +17,13 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view;
+package org.apache.directory.triplesec.adminui.view;
 
-import org.safehaus.triplesec.adminui.security.AuthenticatedPage;
-import org.safehaus.triplesec.adminui.security.AuthenticatedWebSession;
-import org.safehaus.triplesec.adminui.security.PageAuthorizationStrategy;
-import org.safehaus.triplesec.adminui.view.pages.HomePage;
-import org.safehaus.triplesec.adminui.view.pages.LoginPage;
+import org.apache.directory.triplesec.adminui.security.AuthenticatedPage;
+import org.apache.directory.triplesec.adminui.security.AuthenticatedWebSession;
+import org.apache.directory.triplesec.adminui.security.PageAuthorizationStrategy;
+import org.apache.directory.triplesec.adminui.view.pages.HomePage;
+import org.apache.directory.triplesec.adminui.view.pages.LoginPage;
 import wicket.authorization.IUnauthorizedComponentInstantiationListener;
 import wicket.authorization.UnauthorizedInstantiationException;
 import wicket.protocol.http.WebApplication;

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

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/borders/PanelBorder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/borders/PanelBorder.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/borders/PanelBorder.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/borders/PanelBorder.java Sat Dec 30 10:00:46 2006
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view.borders;
+package org.apache.directory.triplesec.adminui.view.borders;
 
 import wicket.markup.html.border.Border;
 import wicket.markup.html.basic.Label;

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/BasePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/BasePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/BasePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/BasePage.java Sat Dec 30 10:00:46 2006
@@ -17,11 +17,11 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view.pages;
+package org.apache.directory.triplesec.adminui.view.pages;
 
 import wicket.markup.html.WebPage;
 import wicket.markup.html.border.Border;
-import org.safehaus.triplesec.adminui.view.borders.PageBorder;
+import org.apache.directory.triplesec.adminui.view.borders.PageBorder;
 
 /**
  * Abstract base class for (most) all pages in the application.  It will

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/HomePage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/HomePage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/HomePage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/HomePage.java Sat Dec 30 10:00:46 2006
@@ -17,10 +17,10 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view.pages;
+package org.apache.directory.triplesec.adminui.view.pages;
 
 import wicket.markup.html.basic.Label;
-import org.safehaus.triplesec.adminui.security.AuthenticatedPage;
+import org.apache.directory.triplesec.adminui.security.AuthenticatedPage;
 
 /**
  * The default home page of the Safehaus Demo web application.

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/LoginPage.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/LoginPage.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/pages/LoginPage.java Sat Dec 30 10:00:46 2006
@@ -17,9 +17,9 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view.pages;
+package org.apache.directory.triplesec.adminui.view.pages;
 
-import org.safehaus.triplesec.adminui.view.panels.LoginPanel;
+import org.apache.directory.triplesec.adminui.view.panels.LoginPanel;
 
 
 public class LoginPage extends BasePage

Modified: directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/panels/BasePanel.java
URL: http://svn.apache.org/viewvc/directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/panels/BasePanel.java?view=diff&rev=491261&r1=491260&r2=491261
==============================================================================
--- directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/panels/BasePanel.java (original)
+++ directory/sandbox/triplesec-jacc/webapp-wicket-admin/src/main/java/org/apache/directory/triplesec/adminui/view/panels/BasePanel.java Sat Dec 30 10:00:46 2006
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.safehaus.triplesec.adminui.view.panels;
+package org.apache.directory.triplesec.adminui.view.panels;
 
 import wicket.markup.html.panel.Panel;
 import wicket.model.IModel;
 import wicket.model.Model;
-import org.safehaus.triplesec.adminui.view.borders.PanelBorder;
+import org.apache.directory.triplesec.adminui.view.borders.PanelBorder;
 
 /**
  * Base class for content panels.

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

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

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



Mime
View raw message