Index: pom.xml
===================================================================
--- pom.xml	(revision 489699)
+++ pom.xml	(working copy)
@@ -22,7 +22,7 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.safehaus.triplesec</groupId>
+  <groupId>org.apache.directory.triplesec</groupId>
   <version>1.0-SNAPSHOT</version>
   <artifactId>build</artifactId>
   <name>Triplesec</name>
@@ -88,19 +88,19 @@
       <dependency>
         <groupId>tomcat</groupId>
         <artifactId>jasper-runtime</artifactId>
-        <version>5.5.9</version>
+        <version>5.5.15</version>
       </dependency>
 
       <dependency>
         <groupId>tomcat</groupId>
         <artifactId>jasper-compiler</artifactId>
-        <version>5.5.9</version>
+        <version>5.5.15</version>
       </dependency>
 
       <dependency>
         <groupId>tomcat</groupId>
         <artifactId>jasper-compiler-jdt</artifactId>
-        <version>5.5.9</version>
+        <version>5.5.15</version>
       </dependency>
 
       <dependency>
@@ -121,22 +121,21 @@
         <version>2.6.2</version>
       </dependency>
 
+
       <dependency>
-        <groupId>tomcat</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>5.5.12</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>1.0.1</version>
       </dependency>
-
       <dependency>
-        <groupId>tomcat</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>5.0.18</version>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        <version>1.0.1</version>
       </dependency>
-
       <dependency>
         <groupId>jetty</groupId>
         <artifactId>org.mortbay.jetty</artifactId>
-        <version>5.1.8</version>
+        <version>5.1.12</version>
       </dependency>
 
       <dependency>
@@ -206,18 +205,6 @@
       </dependency>
 
       <dependency>
-        <groupId>org.apache.mina</groupId>
-        <artifactId>mina-core</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.mina</groupId>
-        <artifactId>mina-filter-ssl</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>1.2</version>
@@ -248,18 +235,6 @@
       </dependency>
 
       <dependency>
-        <groupId>commons-dbcp</groupId>
-        <artifactId>commons-dbcp</artifactId>
-        <version>1.2.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>1.3</version>
-      </dependency>
-
-      <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>1.0.4</version>
@@ -272,12 +247,6 @@
       </dependency>
 
       <dependency>
-        <groupId>jdbm</groupId>
-        <artifactId>jdbm</artifactId>
-        <version>1.0</version>
-      </dependency>
-
-      <dependency>
         <groupId>antlr</groupId>
         <artifactId>antlr</artifactId>
         <version>2.7.6</version>
@@ -290,24 +259,6 @@
       </dependency>
 
       <dependency>
-        <groupId>bouncycastle</groupId>
-        <artifactId>lcrypto-jdk14</artifactId>
-        <version>131</version>
-      </dependency>
-
-      <dependency>
-        <groupId>quartz</groupId>
-        <artifactId>quartz</artifactId>
-        <version>1.5.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>jug</groupId>
-        <artifactId>jug-asl</artifactId>
-        <version>2.0rc6</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
         <version>10.1.3.1</version>
@@ -330,9 +281,45 @@
         <artifactId>spring-context</artifactId>
         <version>1.2.8</version>
       </dependency>
+        <dependency>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+          <version>1.6</version>
+        </dependency>
+
+        <dependency>
+          <groupId>jcharts</groupId>
+          <artifactId>jcharts</artifactId>
+          <version>0.6.0</version>
+        </dependency>
+        <dependency>
+          <groupId>myfaces</groupId>
+          <artifactId>myfaces-api</artifactId>
+          <version>1.1.0</version>
+        </dependency>
+        <dependency>
+          <groupId>myfaces</groupId>
+          <artifactId>myfaces-impl</artifactId>
+          <version>1.1.0</version>
+        </dependency>
+          <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jstl</artifactId>
+          <version>1.1.0</version>
+        </dependency>
+        <dependency>
+         <groupId>commons-digester</groupId>
+         <artifactId>commons-digester</artifactId>
+         <version>1.5</version>
+       </dependency>
+       <dependency>
+         <groupId>commons-beanutils</groupId>
+         <artifactId>commons-beanutils</artifactId>
+         <version>1.6.1</version>
+       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -340,7 +327,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <url>http://triplesec.apache.org/maven2/</url>
 
   <repositories>
@@ -352,18 +339,6 @@
   </repositories>
 
   <distributionManagement>
-    <repository>
-      <id>safehaus</id>
-      <url>
-        scp://safehaus.org/home/domains/m2_safehaus_org/public_html
-      </url>
-    </repository>
-    <snapshotRepository>
-      <id>safehaus</id>
-      <url>
-        scp://safehaus.org/home/domains/m2_safehaus_org/public_html
-      </url>
-    </snapshotRepository>
     <site>
       <id>triplesec.website</id>
       <url>scp://safehaus.org/home/projects/triplesec/public_html/maven</url>
@@ -391,7 +366,7 @@
       <unsubscribe>svn-notify-unsubscribe@safehaus.org</unsubscribe>
     </mailingList>
   </mailingLists>
-  
+
   <!-- ordered alphabetically by id -->
   <developers>
     <developer>
@@ -411,29 +386,177 @@
     </developer>
   </developers>
 
-  <licenses>
-    <license>
-      <name>Open Software License, Version 2.1</name>
-      <url>http://www.opensource.org/licenses/osl-2.1.txt</url>
-    </license>
-  </licenses>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
   <scm>
-    <connection>scm:svn:https://svn.safehaus.org/repos/triplesec/trunk</connection>
-    <url>https://svn.safehaus.org/repos/triplesec/trunk</url>
-    <developerConnection>scm:svn:https://svn.safehaus.org/repos/triplesec/trunk</developerConnection>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/trunks/triplesec</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/trunks/triplesec</developerConnection>
+    <url>https://svn.apache.org/viewvc/directory/trunks/triplesec</url>
   </scm>
 
-  <organization>
-    <name>Safehaus</name>
-    <url>http://safehaus.org</url>
-  </organization>
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
 
+
   <build>
-    <plugins>
+         <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.2</version>
+                    <configuration>
+                        <forkMode>once</forkMode>
+                        <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
+                        <workingDirectory>${project.build.directory}</workingDirectory>
 
+                        <!-- Override the default, do not accept Test* as test classes -->
+                        <excludes>
+                            <exclude>**/Abstract*.java</exclude>
+                            <exclude>**/Test*.java</exclude>
+                        </excludes>
+                        <includes>
+                            <include>**/*Test.java</include>
+                        </includes>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.1</version>
+                    <configuration>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clover-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>2.0-beta-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-one-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven</groupId>
+                            <artifactId>maven-archiver</artifactId>
+                            <!--
+                            FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+                                   until war plugin is updated.
+                            -->
+                            <version>2.2</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-idea-plugin</artifactId>
+                    <version>2.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-eclipse-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jspc-maven-plugin</artifactId>
+                    <version>1.4.5</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>dependency-maven-plugin</artifactId>
+                    <version>1.0</version>
+                </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.0-beta-5</version>
+      </plugin>
+
+       <plugin>
+        <groupId>org.apache.directory.daemon</groupId>
+        <artifactId>daemon-plugin</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+       </plugin>
+      <plugin>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-plugin</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1-SNAPSHOT</version>
+      </plugin>
+
+           </plugins>
+        </pluginManagement>
+
+   <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.5</source>
@@ -444,7 +567,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-SNAPSHOT</version>
       </plugin>
 
       
Index: admin-api/pom.xml
===================================================================
--- admin-api/pom.xml	(revision 489699)
+++ admin-api/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -34,7 +34,6 @@
   </description>
   <packaging>jar</packaging>  
   <dependencies>
-    <!-- 
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-guardian-api</artifactId>
@@ -42,21 +41,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-integration</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-     -->
-
-    <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>triplesec-guardian-api</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-integration</artifactId>
       <version>${pom.version}</version>
     </dependency>
Index: changelog/pom.xml
===================================================================
--- changelog/pom.xml	(revision 489699)
+++ changelog/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 
 <project>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: configuration-io/pom.xml
===================================================================
--- configuration-io/pom.xml	(revision 489699)
+++ configuration-io/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -51,7 +51,6 @@
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <version>1.6</version>
     </dependency>
 
     <dependency>
Index: configuration/pom.xml
===================================================================
--- configuration/pom.xml	(revision 489699)
+++ configuration/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: crypto/pom.xml
===================================================================
--- crypto/pom.xml	(revision 489699)
+++ crypto/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: guardian-api/pom.xml
===================================================================
--- guardian-api/pom.xml	(revision 489699)
+++ guardian-api/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: guardian-ldap/pom.xml
===================================================================
--- guardian-ldap/pom.xml	(revision 489699)
+++ guardian-ldap/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: guardian-ldif/pom.xml
===================================================================
--- guardian-ldif/pom.xml	(revision 489699)
+++ guardian-ldif/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: installers/pom.xml
===================================================================
--- installers/pom.xml	(revision 489699)
+++ installers/pom.xml	(working copy)
@@ -23,7 +23,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: integration/pom.xml
===================================================================
--- integration/pom.xml	(revision 489699)
+++ integration/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -28,6 +28,7 @@
   <name>Triplesec Integration Testing</name>
   <packaging>jar</packaging>  
   <dependencies>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
Index: jaas/pom.xml
===================================================================
--- jaas/pom.xml	(revision 489699)
+++ jaas/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: main/pom.xml
===================================================================
--- main/pom.xml	(revision 489699)
+++ main/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -90,22 +90,18 @@
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xmlParserAPIs</artifactId>
-      <version>2.6.2</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xercesImpl</artifactId>
-      <version>2.0.2</version>
     </dependency>
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>5.0.18</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>5.0.18</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jsp_2.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
@@ -126,7 +122,6 @@
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
-      <version>1.6.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
Index: otp/pom.xml
===================================================================
--- otp/pom.xml	(revision 489699)
+++ otp/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: profile/pom.xml
===================================================================
--- profile/pom.xml	(revision 489699)
+++ profile/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: sms/pom.xml
===================================================================
--- sms/pom.xml	(revision 489699)
+++ sms/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: store/pom.xml
===================================================================
--- store/pom.xml	(revision 489699)
+++ store/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -72,7 +72,6 @@
       <plugin>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-core-plugin</artifactId>
-        <version>1.0.0</version>
         <configuration>
           <schemaSourcesDir>src/main/schema</schemaSourcesDir>
           <schemas>
Index: swing-admin/pom.xml
===================================================================
--- swing-admin/pom.xml	(revision 489699)
+++ swing-admin/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: swing-demo/pom.xml
===================================================================
--- swing-demo/pom.xml	(revision 489699)
+++ swing-demo/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: testdata/pom.xml
===================================================================
--- testdata/pom.xml	(revision 489699)
+++ testdata/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: tools/pom.xml
===================================================================
--- tools/pom.xml	(revision 489699)
+++ tools/pom.xml	(working copy)
@@ -23,7 +23,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: utils-hauskeys/pom.xml
===================================================================
--- utils-hauskeys/pom.xml	(revision 489699)
+++ utils-hauskeys/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: verifier/pom.xml
===================================================================
--- verifier/pom.xml	(revision 489699)
+++ verifier/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: webapp-activation/pom.xml
===================================================================
--- webapp-activation/pom.xml	(revision 489699)
+++ webapp-activation/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -86,16 +86,14 @@
     </dependency>
 
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>5.5.12</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
-      <version>1.2.25</version>
       <scope>provided</scope>
     </dependency>
 
Index: webapp-changelog/pom.xml
===================================================================
--- webapp-changelog/pom.xml	(revision 489699)
+++ webapp-changelog/pom.xml	(working copy)
@@ -22,7 +22,7 @@
 
   <parent>
     <artifactId>build</artifactId>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -49,22 +49,18 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.2.1</version>
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
       <artifactId>myfaces-api</artifactId>
-      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>myfaces</groupId>
       <artifactId>myfaces-impl</artifactId>
-      <version>1.1.0</version>
     </dependency>
       <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>
-      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -77,7 +73,6 @@
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.5</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -86,7 +81,6 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.6.1</version>
     </dependency>
     <dependency>
       <groupId>tomcat</groupId>
@@ -96,7 +90,13 @@
       <groupId>tomcat</groupId>
       <artifactId>jasper-compiler</artifactId>
     </dependency>
+      <!--
     <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler-jdt</artifactId>
+    </dependency>
+    -->
+    <dependency>
       <groupId>xerces</groupId>
       <artifactId>xmlParserAPIs</artifactId>
     </dependency>
Index: webapp-config/pom.xml
===================================================================
--- webapp-config/pom.xml	(revision 489699)
+++ webapp-config/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -32,7 +32,7 @@
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
+        <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <systemProperties>
@@ -51,9 +51,8 @@
       <artifactId>wicket</artifactId>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -93,7 +92,7 @@
       <artifactId>commons-io</artifactId>
       <scope>provided</scope>
     </dependency>
- 
+
     <!-- funny thing is we need a dep on the demo app for test scope
          because we run the integration test with the demo application
          included
@@ -109,7 +108,6 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
Index: webapp-demo/pom.xml
===================================================================
--- webapp-demo/pom.xml	(revision 489699)
+++ webapp-demo/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -42,7 +42,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.1.0</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -55,9 +54,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -89,7 +87,6 @@
     <dependency>
       <groupId>jcharts</groupId>
       <artifactId>jcharts</artifactId>
-      <version>0.6.0</version>
     </dependency>
    <dependency>
       <groupId>commons-httpclient</groupId>
Index: webapp-registration/pom.xml
===================================================================
--- webapp-registration/pom.xml	(revision 489699)
+++ webapp-registration/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -32,7 +32,7 @@
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
+        <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <systemProperties>
@@ -51,9 +51,8 @@
       <artifactId>wicket</artifactId>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: webapp-root/pom.xml
===================================================================
--- webapp-root/pom.xml	(revision 489699)
+++ webapp-root/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -29,8 +29,8 @@
   <packaging>war</packaging>  
   <dependencies>
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
Index: webapp-servlet-demo/pom.xml
===================================================================
--- webapp-servlet-demo/pom.xml	(revision 489699)
+++ webapp-servlet-demo/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -63,8 +63,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
Index: webapp-wicket-admin/pom.xml
===================================================================
--- webapp-wicket-admin/pom.xml	(revision 489699)
+++ webapp-wicket-admin/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
@@ -32,7 +32,7 @@
     <plugins>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty6-plugin</artifactId>
+        <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <systemProperties>
@@ -49,12 +49,10 @@
     <dependency>
       <groupId>wicket</groupId>
       <artifactId>wicket</artifactId>
-      <version>1.2-beta2</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
-      <version>2.3</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
Index: wicket-tools/pom.xml
===================================================================
--- wicket-tools/pom.xml	(revision 489699)
+++ wicket-tools/pom.xml	(working copy)
@@ -20,7 +20,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.safehaus.triplesec</groupId>
+    <groupId>org.apache.directory.triplesec</groupId>
     <artifactId>build</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
Index: webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/PageAuthorizationStrategy.java
===================================================================
--- webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/PageAuthorizationStrategy.java	(revision 489699)
+++ webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/security/PageAuthorizationStrategy.java	(working copy)
@@ -27,9 +27,9 @@
  */
 public class PageAuthorizationStrategy extends SimplePageAuthorizationStrategy
 {
-    public PageAuthorizationStrategy(Class securePageType)
+    public PageAuthorizationStrategy(Class securePageType, Class loginPageType)
     {
-        super( securePageType );
+        super( securePageType, loginPageType );
     }
 
     protected boolean isAuthorized()
Index: webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/view/TriplesecAdminApplication.java
===================================================================
--- webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/view/TriplesecAdminApplication.java	(revision 489699)
+++ webapp-wicket-admin/src/main/java/org/safehaus/triplesec/adminui/view/TriplesecAdminApplication.java	(working copy)
@@ -57,7 +57,7 @@
 
         // set authorization strategy
         getSecuritySettings().setAuthorizationStrategy(
-            new PageAuthorizationStrategy( AuthenticatedPage.class )
+            new PageAuthorizationStrategy( AuthenticatedPage.class, LoginPage.class )
         );
 
         // set unauthorized instantiation instantiation listener