directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r567977 [1/2] - in /directory/sandbox/djencks/triplesec-jacc2: ./ admin-api2/ guardian-ldap/ installers/src/main/installers/ integration/ integration/src/main/java/org/apache/directory/triplesec/integration/ integration/src/test/java/org/ap...
Date Tue, 21 Aug 2007 06:39:42 GMT
Author: djencks
Date: Mon Aug 20 23:39:41 2007
New Revision: 567977

URL: http://svn.apache.org/viewvc?rev=567977&view=rev
Log:
Make the integration tests work again.  Convert to xbean-spring server.xml files

Added:
    directory/sandbox/djencks/triplesec-jacc2/integration/src/test/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java
      - copied unchanged from r564847, directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/resources/triplesec.ldif
      - copied unchanged from r564847, directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/resources/safehaus.ldif
Removed:
    directory/sandbox/djencks/triplesec-jacc2/integration/src/main/java/org/apache/directory/triplesec/integration/TriplesecIntegration.java
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/resources/safehaus.ldif
Modified:
    directory/sandbox/djencks/triplesec-jacc2/admin-api2/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml
    directory/sandbox/djencks/triplesec-jacc2/integration/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml
    directory/sandbox/djencks/triplesec-jacc2/jaas/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml
    directory/sandbox/djencks/triplesec-jacc2/main/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java
    directory/sandbox/djencks/triplesec-jacc2/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseProfile.java
    directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseServerProfile.java
    directory/sandbox/djencks/triplesec-jacc2/store/pom.xml
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
    directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/triplesec.schema
    directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java

Modified: directory/sandbox/djencks/triplesec-jacc2/admin-api2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/admin-api2/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/admin-api2/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/admin-api2/pom.xml Mon Aug 20 23:39:41 2007
@@ -32,35 +32,36 @@
     Administrative API used to manage triplesec server operational parameters,
     the authorization store, user creation and deletion etc.
   </description>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-guardian-api</artifactId>
       <version>${pom.version}</version>
     </dependency>
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>nlog4j</artifactId>
-        <scope>provided</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-integration</artifactId>
+      <groupId>${pom.groupId}</groupId>
+      <version>${pom.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>triplesec-itest-data</artifactId>
       <version>${pom.version}</version>
-        <scope>test</scope>
+      <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>${pom.groupId}</groupId>
-          <artifactId>triplesec-itest-data</artifactId>
-          <version>${pom.version}</version>
-          <scope>test</scope>
-      </dependency>
   </dependencies>
 
   <build>
@@ -87,89 +88,91 @@
       </activation>
       <build>
         <plugins>
-           <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <systemProperties>
-                  <property>
-                    <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
-                    <value>${basedir}/src/test/resources</value>
-                  </property>
-                </systemProperties>
-
-                <excludes>
-                  <exclude>**/*ITest.java</exclude>
-                  <exclude>**/*IntegrationTest.java</exclude>
-                </excludes>
-              </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <executions>
-                <execution>
-                  <phase>validate</phase>
-                  <configuration>
-                    <tasks>
-                      <echo>
-=================================================================
-                          W A R N I N G
-                          -------------
-
-Integration tests have been disabled.  To enable integration
-tests run maven with the -Dintegration switch.
-=================================================================
-                      </echo>
-                    </tasks>
-                  </configuration>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-         </plugins>
-       </build>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
+                  <value>${basedir}/src/test/resources</value>
+                </property>
+              </systemProperties>
+
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+                <exclude>**/*IntegrationTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+                      =================================================================
+                      W A R N I N G
+                      -------------
+
+                      Integration tests have been disabled. To enable integration
+                      tests run maven with the -Dintegration switch.
+                      =================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>integration</id>
       <activation>
-        <property><name>integration</name></property>
+        <property>
+          <name>integration</name>
+        </property>
       </activation>
-        <build>
+      <build>
         <plugins>
-            <plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>dependency-maven-plugin</artifactId>
             <executions>
-                <execution>
-                    <id>unpack-itest-data</id>
-                    <phase>compile</phase>
-                    <goals>
-                        <goal>unpack</goal>
-                    </goals>
-                    <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>${pom.groupId}</groupId>
-                                <artifactId>triplesec-itest-data</artifactId>
-                                <version>${pom.version}</version>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
-                    </configuration>
-                </execution>
+              <execution>
+                <id>unpack-itest-data</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>triplesec-itest-data</artifactId>
+                      <version>${pom.version}</version>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+                </configuration>
+              </execution>
 
             </executions>
-        </plugin>
+          </plugin>
 
-            <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                  <forkMode>once</forkMode>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <forkMode>once</forkMode>
+            </configuration>
+          </plugin>
         </plugins>
-        </build>
+      </build>
     </profile>
   </profiles>
 

Modified: directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/guardian-ldap/pom.xml Mon Aug 20 23:39:41 2007
@@ -31,7 +31,7 @@
   <description>
     An LDAP driver which access an LDAP policy store.
   </description>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
   <dependencies>
     <dependency>
       <artifactId>nlog4j</artifactId>
@@ -47,14 +47,15 @@
       <artifactId>triplesec-integration</artifactId>
       <groupId>${pom.groupId}</groupId>
       <version>${pom.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>triplesec-itest-data</artifactId>
+      <version>${pom.version}</version>
       <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>${pom.groupId}</groupId>
-          <artifactId>triplesec-itest-data</artifactId>
-          <version>${pom.version}</version>
-          <scope>test</scope>
-      </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -80,83 +81,85 @@
       </activation>
       <build>
         <plugins>
-           <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <systemProperties>
-                  <property>
-                    <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
-                    <value>${basedir}/src/test/resources</value>
-                  </property>
-                </systemProperties>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
+                  <value>${basedir}/src/test/resources</value>
+                </property>
+              </systemProperties>
 
-                <excludes>
-                  <exclude>**/*ITest.java</exclude>
-                  <exclude>**/*IntegrationTest.java</exclude>
-                </excludes>
-              </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <executions>
-                <execution>
-                  <phase>validate</phase>
-                  <configuration>
-                    <tasks>
-                      <echo>
-=================================================================
-                          W A R N I N G
-                          -------------
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+                <exclude>**/*IntegrationTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+                      =================================================================
+                      W A R N I N G
+                      -------------
 
-Integration tests have been disabled.  To enable integration
-tests run maven with the -Dintegration switch.
-=================================================================
-                      </echo>
-                    </tasks>
-                  </configuration>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-         </plugins>
-       </build>
+                      Integration tests have been disabled. To enable integration
+                      tests run maven with the -Dintegration switch.
+                      =================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>integration</id>
       <activation>
-        <property><name>integration</name></property>
+        <property>
+          <name>integration</name>
+        </property>
       </activation>
-        <build>
+      <build>
         <plugins>
-            <plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>dependency-maven-plugin</artifactId>
             <executions>
-                <execution>
-                    <id>unpack-itest-data</id>
-                    <phase>compile</phase>
-                    <goals>
-                        <goal>unpack</goal>
-                    </goals>
-                    <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>${pom.groupId}</groupId>
-                                <artifactId>triplesec-itest-data</artifactId>
-                                <version>${pom.version}</version>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
-                    </configuration>
-                </execution>
+              <execution>
+                <id>unpack-itest-data</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>triplesec-itest-data</artifactId>
+                      <version>${pom.version}</version>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+                </configuration>
+              </execution>
 
             </executions>
-        </plugin>
+          </plugin>
 
         </plugins>
-        </build>
+      </build>
     </profile>
   </profiles>
 

Modified: directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/installers/src/main/installers/server.xml Mon Aug 20 23:39:41 2007
@@ -35,8 +35,8 @@
         <prop key="kdc.tgs.postdate.allowed">true</prop>
         <prop key="kdc.tgs.renewable.allowed">true</prop>
 
-        <prop key="safehaus.entry.basedn">ou=Users,dc=example,dc=com</prop>
-        <prop key="safehaus.load.testdata">true</prop>
+        <prop key="triplesec.entry.basedn">ou=Users,dc=example,dc=com</prop>
+        <prop key="triplesec.load.testdata">true</prop>
         <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>

Modified: directory/sandbox/djencks/triplesec-jacc2/integration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/integration/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/integration/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/integration/pom.xml Mon Aug 20 23:39:41 2007
@@ -26,13 +26,13 @@
   </parent>
   <artifactId>triplesec-integration</artifactId>
   <name>Triplesec Integration Testing</name>
-  <packaging>jar</packaging>  
+  <packaging>jar</packaging>
   <dependencies>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -44,17 +44,44 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>triplesec-bootstrap-partition</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-      <dependency>
-          <groupId>${pom.groupId}</groupId>
-          <artifactId>triplesec-itest-data</artifactId>
-          <version>${pom.version}</version>
-          <scope>test</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-xbean-spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>triplesec-itest-data</artifactId>
+      <version>${pom.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <executions>
+              <execution>
+                  <goals>
+                      <!-- Build *test.jar files for modules -->
+                      <goal>test-jar</goal>
+                  </goals>
+              </execution>
+          </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>no-integration-tests</id>
@@ -63,73 +90,75 @@
       </activation>
       <build>
         <plugins>
-           <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <excludes>
-                  <exclude>**/*ITest.java</exclude>
-                  <exclude>**/*IntegrationTest.java</exclude>
-                </excludes>
-              </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <executions>
-                <execution>
-                  <phase>validate</phase>
-                  <configuration>
-                    <tasks>
-                      <echo>
-=================================================================
-                          W A R N I N G
-                          -------------
-
-Integration tests have been disabled.  To enable integration
-tests run maven with the -Dintegration switch.
-=================================================================
-                      </echo>
-                    </tasks>
-                  </configuration>
-                  <goals>
-                    <goal>run</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-         </plugins>
-       </build>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+                <exclude>**/*IntegrationTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <configuration>
+                  <tasks>
+                    <echo>
+                      =================================================================
+                      W A R N I N G
+                      -------------
+
+                      Integration tests have been disabled. To enable integration
+                      tests run maven with the -Dintegration switch.
+                      =================================================================
+                    </echo>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>integration</id>
       <activation>
-        <property><name>integration</name></property>
+        <property>
+          <name>integration</name>
+        </property>
       </activation>
       <build>
         <plugins>
-            <plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>dependency-maven-plugin</artifactId>
             <executions>
-                <execution>
-                    <id>unpack-itest-data</id>
-                    <phase>compile</phase>
-                    <goals>
-                        <goal>unpack</goal>
-                    </goals>
-                    <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>${pom.groupId}</groupId>
-                                <artifactId>triplesec-itest-data</artifactId>
-                                <version>${pom.version}</version>
-                            </artifactItem>
-                        </artifactItems>
-                        <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
-                    </configuration>
-                </execution>
+              <execution>
+                <id>unpack-itest-data</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>triplesec-itest-data</artifactId>
+                      <version>${pom.version}</version>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+                </configuration>
+              </execution>
 
             </executions>
-        </plugin>
+          </plugin>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>

Modified: directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/itest-data/src/main/resources/server.xml Mon Aug 20 23:39:41 2007
@@ -12,6 +12,38 @@
         <prop key="java.naming.security.authentication">simple</prop>
         <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.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>
+        <prop key="kdc.encryption.types">des-cbc-md5 des3-cbc-sha1 des3-cbc-md5 des-cbc-md4 des-cbc-crc</prop>
+        <prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>
+        <prop key="kdc.java.naming.security.credentials">secret</prop>
+
+        <prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>
+        <prop key="changepw.java.naming.security.credentials">secret</prop>
+        <prop key="changepw.principal">kadmin/changepw@EXAMPLE.COM</prop>
+
+        -->
+<!-- All times are in minutes -->
+<!--
+        <prop key="kdc.allowable.clockskew">5</prop>
+        <prop key="kdc.tgs.maximum.ticket.lifetime">1440</prop>
+        <prop key="kdc.tgs.maximum.renewable.lifetime">10080</prop>
+        <prop key="kdc.pa.enc.timestamp.required">true</prop>
+        <prop key="kdc.tgs.empty.addresses.allowed">true</prop>
+        <prop key="kdc.tgs.forwardable.allowed">true</prop>
+        <prop key="kdc.tgs.proxiable.allowed">true</prop>
+        <prop key="kdc.tgs.postdate.allowed">true</prop>
+        <prop key="kdc.tgs.renewable.allowed">true</prop>
+-->
+
+        <prop key="triplesec.entry.basedn">ou=Users,dc=example,dc=com</prop>
+        <prop key="triplesec.load.testdata">true</prop>
+        <prop key="kerberos.sam.type.7">org.apache.directory.triplesec.verifier.hotp.DefaultHotpSamVerifier</prop>
       </props>
     </property>
   </bean>
@@ -29,7 +61,7 @@
     <changePasswordConfiguration>
       <changePasswordConfiguration
               enabled="false"
-              ipPort="464">
+              ipPort="1464">
       </changePasswordConfiguration>
     </changePasswordConfiguration>
 
@@ -50,7 +82,7 @@
     <kdcConfiguration>
       <kdcConfiguration
               enabled="false"
-              ipPort="88">
+              ipPort="1088">
       </kdcConfiguration>
     </kdcConfiguration>
 
@@ -230,9 +262,11 @@
       <subentryService/>
       <collectiveAttributeService/>
       <eventService/>
+      <policyProtectionInterceptor xmlns="http://triplesec.directory.apache.org/config/1.0"/>
       <triggerService/>
 
         <!-- Uncomment to enable replication service -->
+<!--
         <replicationService >
           <configuration>
             <replicationConfiguration
@@ -244,8 +278,7 @@
             </replicationConfiguration>
           </configuration>
         </replicationService>
-      <!--
-        -->
+-->
     </interceptors>
   </mutableServerStartupConfiguration>
 

Modified: directory/sandbox/djencks/triplesec-jacc2/jaas/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jaas/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jaas/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jaas/pom.xml Mon Aug 20 23:39:41 2007
@@ -28,7 +28,7 @@
   <name>Triplesec JAAS Login Module</name>
   <packaging>jar</packaging>
   <description>
-    A Safehaue Triplsec JAAS LoginModule which accounts for SAM execeptions, and ties
+    A Safehaue Triplesec JAAS LoginModule which accounts for SAM execeptions, and ties
     in Guardian for authorization.
   </description>
   <dependencies>
@@ -59,6 +59,7 @@
       <artifactId>triplesec-integration</artifactId>
       <groupId>${pom.groupId}</groupId>
       <version>${pom.version}</version>
+      <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/jacc/pom.xml Mon Aug 20 23:39:41 2007
@@ -17,167 +17,169 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.directory.triplesec</groupId>
-        <artifactId>triplesec-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>triplesec-jacc</artifactId>
-    <name>TripleSec :: JACC</name>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>triplesec-jaas</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>triplesec-admin-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>triplesec-guardian-ldap</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>triplesec-integration</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>triplesec-itest-data</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
+  <parent>
+    <groupId>org.apache.directory.triplesec</groupId>
+    <artifactId>triplesec-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>triplesec-jacc</artifactId>
+  <name>TripleSec :: JACC</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>triplesec-jaas</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>triplesec-admin-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>triplesec-guardian-ldap</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <artifactId>triplesec-integration</artifactId>
+      <groupId>${pom.groupId}</groupId>
+      <version>${pom.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>triplesec-itest-data</artifactId>
+      <version>${pom.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>java.security.auth.login.config</name>
+              <value>${pom.basedir}/src/test/data/data/login.config</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>no-integration-tests</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
+                  <value>${basedir}/src/test</value>
+                </property>
+              </systemProperties>
+
+              <excludes>
+                <exclude>**/*ITest.java</exclude>
+                <exclude>**/*IntegrationTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
                 <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>java.security.auth.login.config</name>
-                            <value>${pom.basedir}/src/test/data/data/login.config</value>
-                        </property>
-                    </systemProperties>
+                  <tasks>
+                    <echo>
+                      =================================================================
+                      W A R N I N G
+                      -------------
+
+                      Integration tests have been disabled. To enable integration
+                      tests run maven with the -Dintegration switch.
+                      =================================================================
+                    </echo>
+                  </tasks>
                 </configuration>
-            </plugin>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>no-integration-tests</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemProperties>
-                                <property>
-                                    <name>org.apache.directory.triplesec.integration.resourcesDirectory</name>
-                                    <value>${basedir}/src/test</value>
-                                </property>
-                            </systemProperties>
-
-                            <excludes>
-                                <exclude>**/*ITest.java</exclude>
-                                <exclude>**/*IntegrationTest.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <tasks>
-                                        <echo>
-                                            =================================================================
-                                            W A R N I N G
-                                            -------------
-
-                                            Integration tests have been disabled. To enable integration
-                                            tests run maven with the -Dintegration switch.
-                                            =================================================================
-                                        </echo>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>integration</id>
-            <activation>
-                <property>
-                    <name>integration</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>dependency-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack-itest-data</id>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${pom.groupId}</groupId>
-                                            <artifactId>triplesec-itest-data</artifactId>
-                                            <version>${pom.version}</version>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+    <profile>
+      <id>integration</id>
+      <activation>
+        <property>
+          <name>integration</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>dependency-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-itest-data</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>${pom.groupId}</groupId>
+                      <artifactId>triplesec-itest-data</artifactId>
+                      <version>${pom.version}</version>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.build.directory}/serverHome/conf</outputDirectory>
+                </configuration>
+              </execution>
+
+            </executions>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
 

Modified: directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/conf/server.xml Mon Aug 20 23:39:41 2007
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-  "http://www.springframework.org/dtd/spring-beans.dtd">
+        "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
+<!-- bean I didn't convert -->
   <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
     <property name="properties">
       <props>
+        <!-- JNDI security properties used to get initial contexts.         -->
         <prop key="java.naming.security.authentication">simple</prop>
         <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
         <prop key="java.naming.security.credentials">secret</prop>
@@ -42,202 +44,242 @@
     </property>
   </bean>
 
-  <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>
-    <property name="ldapPort"><value>10389</value></property>
-    <property name="enableKerberos"><value>true</value></property>
-    <property name="enableNtp"><value>false</value></property>
-    <property name="enableChangePassword"><value>true</value></property>
-
-    <!-- Uncomment below to have the server load entries on startup!        -->
-    <!-- ldifDirectory property can point to a relative file, directory or  -->
-    <!-- can point to an absolute path to either using the URL path         -->
-    <!-- notation: i.e. file:///Users/jack/apacheds/ldifs                   -->
-
-    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
-    <!-- order specified.  The included Krb5KdcEntryFilter will filter      -->
-    <!-- kerberos principals creating keys for them using their             -->
-    <!-- userPassword attribute if present.                                 -->
-
-    <!-- If missing the Triplesec server will use LDIF files under the conf -->
-    <!-- directory where it has been installed.                             -->
-
-    <!--
-    <property name="ldifDirectory">
-      <value>example.ldif</value>
-    </property>
-    -->
-    <property name="ldifFilters">
-      <list>
-        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
-      </list>
-    </property>
 
-    <property name="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>
-      </bean>  
-    </property>    
-    
-    <property name="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>
-        <property name="smsTransportUrl"><value>http://www.nbroadcasting.com/customers/messages/Sender.asp</value></property>
-      </bean>  
-    </property>    
-    
-    <property name="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>
-             <property name="smtpPassword"><value>secret</value></property>
-             -->
-             <property name="smtpHost"><value>localhost</value></property>
-             <property name="smtpSubject"><value>Triplesec Account Activated</value></property>
-             <property name="smtpFrom"><value>dev@triplesec.org</value></property>
-           </bean>  
-         </property>    
-         
-    <property name="contextPartitionConfigurations">
-      <set>
-        <ref bean="examplePartitionConfiguration"/>
-      </set>
-    </property>
-    <property name="bootstrapSchemas">
-      <set>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.CorbaSchema"/>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.CoreSchema"/>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.CosineSchema"/>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.ApacheSchema"/>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.CollectiveSchema"/>
-        <bean class="org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema"/>
-        <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.apache.directory.triplesec.store.schema.TriplesecSchema"/>
-      </set>
-    </property>
-    
-    <property name="extendedOperationHandlers">
-      <list>
-        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
-        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
-      </list>
-    </property>  
-
-    <property name="interceptorConfigurations">
-      <list>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>normalizationService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>authenticationService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>referralService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.referral.ReferralService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>authorizationService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>DefaultAuthorizationService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>exceptionService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>schemaService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.schema.SchemaService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>subentryService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>operationalAttributeService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>collectiveAttributeService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>eventService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.event.EventService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name"><value>policyProtectionService</value></property>
-          <property name="interceptor">
-            <bean class="org.apache.directory.triplesec.store.interceptor.PolicyProtectionInterceptor" />
-          </property>
-        </bean>
-      </list>
-    </property>
-  </bean>
-  
-  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.configuration.MutablePartitionConfiguration">
-    <property name="name"><value>example</value></property>
-    <property name="suffix"><value>dc=example,dc=com</value></property>
-    <property name="indexedAttributes">
-      <set>
-        <value>objectClass</value>
-        <value>ou</value>
-        <value>dc</value>
-        <value>uid</value>
-        <value>profileId</value>
-        <value>roles</value>
-        <value>grants</value>
-        <value>denials</value>
-        <value>krb5PrincipalName</value>
-      </set>
-    </property>
-    <property name="contextEntry">
-      <value>
-        objectClass: top
-        objectClass: domain
-        objectClass: extensibleObject
-        dc: example
-        administrativeRole: accessControlSpecificArea
-        administrativeRole: collectiveAttributeSpecificArea
-      </value>
-    </property>
-  </bean>
+  <mutableServerStartupConfiguration id="configuration" xmlns="http://apacheds.org/config/1.0"
+                                     workingDirectory="example.com"
+                                     synchPeriodMillis="15000"
+                                     maxThreads="8"
+                                     allowAnonymousAccess="false"
+                                     accessControlEnabled="false"
+                                     denormalizeOpAttrsEnabled="false"
+          >
+
+    <changePasswordConfiguration>
+      <changePasswordConfiguration
+              enabled="false"
+              ipPort="464">
+      </changePasswordConfiguration>
+    </changePasswordConfiguration>
+
+    <ntpConfiguration>
+      <ntpConfiguration
+              enabled="false"
+              ipPort="123">
+      </ntpConfiguration>
+    </ntpConfiguration>
+
+    <dnsConfiguration>
+      <dnsConfiguration
+              enabled="false"
+              ipPort="53">
+      </dnsConfiguration>
+    </dnsConfiguration>
+
+    <kdcConfiguration>
+      <kdcConfiguration
+              enabled="false"
+              ipPort="88">
+      </kdcConfiguration>
+    </kdcConfiguration>
+
+    <ldapsConfiguration>
+      <ldapConfiguration id="ldapsConfiguration"
+                         enabled="false"
+                         ipPort="636"
+                         enableLdaps="true">
+      </ldapConfiguration>
+    </ldapsConfiguration>
+
+    <ldapConfiguration>
+      <ldapConfiguration id="ldapConfiguration"
+              ipPort="10389"
+              allowAnonymousAccess="false"
+              saslHost="ldap.example.com"
+              saslPrincipal="ldap/ldap.example.com@EXAMPLE.COM"
+              searchBaseDn="ou=users,ou=system"
+              maxTimeLimit="15000"
+              maxSizeLimit="1000">
+
+        <!-- The list of supported authentication mechanisms.                   -->
+        <supportedMechanisms>
+          <value xmlns="http://www.springframework.org/schema/beans">SIMPLE</value>
+          <value xmlns="http://www.springframework.org/schema/beans">CRAM-MD5</value>
+          <value xmlns="http://www.springframework.org/schema/beans">DIGEST-MD5</value>
+          <!--<value xmlns="http://www.springframework.org/schema/beans">GSSAPI</value>-->
+        </supportedMechanisms>
+
+        <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI.  -->
+        <saslQop>
+          <value xmlns="http://www.springframework.org/schema/beans">auth</value>
+          <value xmlns="http://www.springframework.org/schema/beans">auth-int</value>
+          <value xmlns="http://www.springframework.org/schema/beans">auth-conf</value>
+        </saslQop>
+
+        <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
+        <saslRealms>
+          <value xmlns="http://www.springframework.org/schema/beans">example.com</value>
+          <value xmlns="http://www.springframework.org/schema/beans">apache.org</value>
+        </saslRealms>
+
+        <!-- the collection of extended operation handlers to install           -->
+        <extendedOperationHandlers>
+          <!--startTlsHandler/-->
+          <gracefulShutdownHandler/>
+          <launchDiagnosticUiHandler/>
+          <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.-->
+          <!--storedProcedureExtendedOperationHandler/-->
+        </extendedOperationHandlers>
+      </ldapConfiguration>
+    </ldapConfiguration>
+
+    <systemPartitionConfiguration>
+      <!-- use the following partitionConfiguration to override defaults for  -->
+      <!-- the system partition                                               -->
+      <mutableBTreePartitionConfiguration id="systemPartitionConfiguration"
+        name="system"
+        cacheSize="100"
+        suffix="ou=system"
+        optimizerEnabled="true"
+        synchOnWrite="true"
+        partitionClassName="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition">
+        <indexedAttributes>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.1"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.2"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.3"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.4"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.5"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.6"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.7"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="ou"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="uid"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="objectClass"
+              cacheSize="100"/>
+        </indexedAttributes>
+        <contextEntry>
+          <value xmlns="http://www.springframework.org/schema/beans">
+            objectClass: top
+            objectClass: organizationalUnit
+            objectClass: extensibleObject
+            ou: system
+          </value>
+        </contextEntry>
+      </mutableBTreePartitionConfiguration>
+    </systemPartitionConfiguration>
+
+    <partitionConfigurations>
+      <mutableBTreePartitionConfiguration id="examplePartitionConfiguration"
+        name="example"
+        cacheSize="100"
+        suffix="dc=example,dc=com"
+        optimizerEnabled="true"
+        synchOnWrite="true"
+        partitionClassName="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition">
+        <indexedAttributes>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.1"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.2"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.3"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.4"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.5"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.6"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="1.3.6.1.4.1.18060.0.4.1.2.7"
+              cacheSize="10"/>
+            <mutableIndexConfiguration
+              attributeId="dc"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="ou"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="krb5PrincipalName"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="uid"
+              cacheSize="100"/>
+            <mutableIndexConfiguration
+              attributeId="objectClass"
+              cacheSize="100"/>
+        </indexedAttributes>
+        <contextEntry>
+          <value xmlns="http://www.springframework.org/schema/beans">
+            objectClass: top
+            objectClass: domain
+            objectClass: extensibleObject
+            dc: example
+          </value>
+        </contextEntry>
+      </mutableBTreePartitionConfiguration>
+    </partitionConfigurations>
+
+    <interceptors>
+      <normalizationService/>
+      <authenticationService/>
+      <referralService/>
+      <authorizationService/>
+      <defaultAuthorizationService/>
+      <exceptionService/>
+      <operationalAttributeService/>
+      <!-- Uncomment to enable the password policy service
+      <passwordPolicyService/>
+      <keyDerivationService/>
+      -->
+      <schemaService/>
+      <subentryService/>
+      <collectiveAttributeService/>
+      <eventService/>
+      <policyProtectionInterceptor xmlns="http://triplesec.directory.apache.org/config/1.0"/>
+      <triggerService/>
+
+        <!-- Uncomment to enable replication service -->
+<!--
+        <replicationService >
+          <configuration>
+            <replicationConfiguration
+              serverPort="10390"
+              peerReplicas="instance_b@localhost:10392">
+              <replicaId>
+                <replicaId id="instance_a"/>
+              </replicaId>
+            </replicationConfiguration>
+          </configuration>
+        </replicationService>
+-->
+    </interceptors>
+  </mutableServerStartupConfiguration>
 
+
+<!-- another bean I didn't convert -->
   <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
     <property name="customEditors">
       <map>
@@ -245,6 +287,6 @@
           <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
         </entry>
       </map>
-   </property>
+    </property>
   </bean>
 </beans>

Modified: directory/sandbox/djencks/triplesec-jacc2/main/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/pom.xml Mon Aug 20 23:39:41 2007
@@ -29,6 +29,10 @@
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+    </dependency>
+    <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>triplesec-bootstrap-partition</artifactId>
       <version>${pom.version}</version>

Modified: directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/main/src/main/java/org/apache/directory/triplesec/Service.java Mon Aug 20 23:39:41 2007
@@ -49,11 +49,12 @@
 import org.apache.directory.triplesec.store.DefaultServerProfileStore;
 import org.apache.directory.triplesec.store.ServerProfileStore;
 
+import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 
 /**
@@ -339,7 +340,7 @@
             if ( PropertiesUtils.get( env, "triplesec.load.testdata", true ) )
             {
                 ServerProfileStore store;
-                store = new DefaultServerProfileStore( ( DirContext ) userContext.lookup( "ou=Users" ) );
+                store = new DefaultServerProfileStore( ( DirContext ) userContext.lookup( "ou=users" ) );
                 addDemoProfiles( store, env.getProperty( "kdc.primary.realm" ) );
             }
         }

Modified: directory/sandbox/djencks/triplesec-jacc2/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/pom.xml Mon Aug 20 23:39:41 2007
@@ -224,6 +224,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-xbean-spring</artifactId>
+        <version>1.5.1-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1-codec</artifactId>
         <version>0.9.7-SNAPSHOT</version>
@@ -236,6 +242,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>3.1</version>
+      </dependency>
+
+      <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>1.2</version>
@@ -298,20 +310,21 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>1.2.8</version>
+        <version>2.0.5</version>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>1.2.8</version>
+        <version>2.0.5</version>
       </dependency>
 
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>1.2.8</version>
+        <version>2.0.5</version>
       </dependency>
+
       <dependency>
         <groupId>dom4j</groupId>
         <artifactId>dom4j</artifactId>
@@ -447,7 +460,8 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.2</version>
           <configuration>
-            <forkMode>never</forkMode>
+            <!--<forkMode>never</forkMode>-->
+            <!--<argLine>-enableassertions -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>-->
             <argLine>-enableassertions</argLine>
             <workingDirectory>${project.build.directory}</workingDirectory>
 
@@ -591,6 +605,12 @@
           <version>6.1.0rc2</version>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.xbean</groupId>
+          <artifactId>maven-xbean-plugin</artifactId>
+          <version>3.1</version>
+        </plugin>
+ 
       </plugins>
     </pluginManagement>
 

Modified: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseProfile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseProfile.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseProfile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseProfile.java Mon Aug 20 23:39:41 2007
@@ -136,7 +136,7 @@
     }
 
 
-    void setInfo( String info )
+    public void setInfo( String info )
     {
         this.info = info;
     }
@@ -148,7 +148,7 @@
     }
     
     
-    void setDisabled( boolean disabled )
+    public void setDisabled( boolean disabled )
     {
         this.disabled = disabled;
     }

Modified: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseServerProfile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseServerProfile.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseServerProfile.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/BaseServerProfile.java Mon Aug 20 23:39:41 2007
@@ -162,19 +162,19 @@
     }
 
 
-    void setResynchCount( int resynchCount )
+    public void setResynchCount( int resynchCount )
     {
         this.resynchCount = resynchCount;
     }
 
 
-    void setFailuresInEpoch( int failuresInEpoch )
+    public void setFailuresInEpoch( int failuresInEpoch )
     {
         this.failuresInEpoch = failuresInEpoch;
     }
 
 
-    void setActivationKey( String activationKey )
+    public void setActivationKey( String activationKey )
     {
     	this.activationKey = activationKey;
     }
@@ -202,4 +202,6 @@
     {
         return notifyBy;
     }
+
+
 }

Modified: directory/sandbox/djencks/triplesec-jacc2/store/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/pom.xml?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/pom.xml (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/pom.xml Mon Aug 20 23:39:41 2007
@@ -81,6 +81,8 @@
       <artifactId>apacheds-core-unit</artifactId>
       <scope>test</scope>
     </dependency>
+
+    
   </dependencies>
   <build>
     <plugins>
@@ -106,6 +108,49 @@
             <goals>
               <goal>generate</goal>
             </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>maven-xbean-plugin</artifactId>
+        <executions>
+          <execution>
+            <configuration>
+              <namespace>http://triplesec.directory.apache.org/config/1.0</namespace>
+              <schema>target/xbean/${pom.artifactId}.xsd</schema>
+            </configuration>
+            <goals>
+              <goal>mapping</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!--  lets ensure that the XSD gets deployed  -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${basedir}/target/xbean/${pom.artifactId}.xsd</file>
+                  <type>xsd</type>
+                </artifact>
+                <artifact>
+                  <file>${basedir}/target/xbean/${pom.artifactId}.xsd.html</file>
+                  <type>xsd.html</type>
+                </artifact>
+              </artifacts>
+            </configuration>
           </execution>
         </executions>
       </plugin>

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/ProfileObjectFactory.java Mon Aug 20 23:39:41 2007
@@ -31,6 +31,7 @@
 import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.triplesec.profile.BaseServerProfileModifier;
+import org.apache.directory.triplesec.profile.BaseServerProfile;
 
 
 /**
@@ -58,54 +59,66 @@
         {
             return null;
         }
+        BaseServerProfile profile = new BaseServerProfile( ( String ) attrs.get( "triplesecUid" ).get(),
+                ( String ) attrs.get( "triplesecRealm" ).get(),
+                ( String ) attrs.get( "triplesecLabel" ).get(),
+            Long.parseLong( ( String ) attrs.get( "triplesecFactor" ).get() ),
+                toBytes(attrs.get( "triplesecSecret" ).get()),
+                ( String ) attrs.get( "triplesecTokenPin" ).get(),
+                toBytes(attrs.get( "userPassword" ).get()));
+        profile.setInfo( ( String ) attrs.get( "triplesecInfo" ).get() );
+        profile.setFailuresInEpoch( Integer.parseInt( ( String ) attrs.get( "triplesecFailuresInEpoch" ).get() ) );
+        profile.setResynchCount( Integer.parseInt( ( String ) attrs.get( "triplesecResynchCount" ).get() ) );
+        if ( attrs.get( "triplesecActivationKey" ) != null )
+        {
+            profile.setActivationKey( ( String ) attrs.get( "triplesecActivationKey" ).get() );
+        }
 
-        BaseServerProfileModifier modifier = new BaseServerProfileModifier();
-        modifier.setUserId( ( String ) attrs.get( "triplesecUid" ).get() );
-        modifier.setRealm( ( String ) attrs.get( "triplesecRealm" ).get() );
-        modifier.setLabel( ( String ) attrs.get( "triplesecLabel" ).get() );
-        modifier.setTokenPin( ( String ) attrs.get( "triplesecTokenPin" ).get() );
-        modifier.setFactor( Long.parseLong( ( String ) attrs.get( "triplesecFactor" ).get() ) );
+//        BaseServerProfileModifier modifier = new BaseServerProfileModifier();
+//        modifier.setUserId( ( String ) attrs.get( "triplesecUid" ).get() );
+//        modifier.setRealm( ( String ) attrs.get( "triplesecRealm" ).get() );
+//        modifier.setLabel( ( String ) attrs.get( "triplesecLabel" ).get() );
+//        modifier.setTokenPin( ( String ) attrs.get( "triplesecTokenPin" ).get() );
+//        modifier.setFactor( Long.parseLong( ( String ) attrs.get( "triplesecFactor" ).get() ) );
         
         if ( attrs.get( KerberosAttribute.ACCOUNT_DISABLED ) != null )
         {
-            modifier.setDisabled( parseBoolean( ( ( String ) 
+            profile.setDisabled( parseBoolean( ( ( String )
                 attrs.get( KerberosAttribute.ACCOUNT_DISABLED ).get() ).toLowerCase() ) );
         }
 
-        Object secret = attrs.get( "triplesecSecret" ).get();
-        if ( secret instanceof String )
-        {
-            modifier.setSecret( StringTools.getBytesUtf8( ( String ) secret ) );
-        }
-        else
-        {
-            modifier.setSecret( ( byte[] ) secret );
-        }
 
-        Object password = attrs.get( "userPassword" ).get();
-        if ( password instanceof String )
-        {
-            modifier.setPassword( StringTools.getBytesUtf8( ( String ) password ) );
-        }
-        else
-        {
-            modifier.setPassword( ( byte[] ) password );
-        }
-        
-        modifier.setFailuresInEpoch( Integer.parseInt( ( String ) attrs.get( "triplesecFailuresInEpoch" ).get() ) );
-        modifier.setResynchCount( Integer.parseInt( ( String ) attrs.get( "triplesecResynchCount" ).get() ) );
 
-        if ( attrs.get( "triplesecInfo" ) != null )
+//        modifier.setFailuresInEpoch( Integer.parseInt( ( String ) attrs.get( "triplesecFailuresInEpoch" ).get() ) );
+//        modifier.setResynchCount( Integer.parseInt( ( String ) attrs.get( "triplesecResynchCount" ).get() ) );
+
+//        if ( attrs.get( "triplesecInfo" ) != null )
+//        {
+//            modifier.setInfo( ( String ) attrs.get( "triplesecInfo" ).get() );
+//        }
+//
+//        if ( attrs.get( "triplesecActivationKey" ) != null )
+//        {
+//            modifier.setActivationKey( ( String ) attrs.get( "triplesecActivationKey" ).get() );
+//        }
+
+//        return modifier.getServerProfile();
+        return profile;
+    }
+
+
+    private byte[] toBytes( Object secretObj )
+    {
+        byte[] secret;
+        if ( secretObj instanceof String )
         {
-            modifier.setInfo( ( String ) attrs.get( "triplesecInfo" ).get() );
+            secret = StringTools.getBytesUtf8( ( String ) secretObj );
         }
-
-        if ( attrs.get( "triplesecActivationKey" ) != null )
+        else
         {
-            modifier.setActivationKey( ( String ) attrs.get( "triplesecActivationKey" ).get() );
+            secret = ( byte[] ) secretObj;
         }
-
-        return modifier.getServerProfile();
+        return secret;
     }
 
 

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/ApplicationAciManager.java Mon Aug 20 23:39:41 2007
@@ -24,6 +24,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Map;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -37,6 +38,16 @@
 import org.apache.directory.server.core.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
+import org.apache.directory.server.core.normalization.NormalizationService;
+import org.apache.directory.server.core.authn.AuthenticationService;
+import org.apache.directory.server.core.referral.ReferralService;
+import org.apache.directory.server.core.authz.AuthorizationService;
+import org.apache.directory.server.core.authz.DefaultAuthorizationService;
+import org.apache.directory.server.core.operational.OperationalAttributeService;
+import org.apache.directory.server.core.schema.SchemaService;
+import org.apache.directory.server.core.subtree.SubentryService;
+import org.apache.directory.server.core.event.EventService;
+import org.apache.directory.server.core.collective.CollectiveAttributeService;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
 import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -44,6 +55,7 @@
 import org.apache.directory.shared.ldap.message.ModificationItemImpl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.OidNormalizer;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.NamespaceTools;
 import org.slf4j.Logger;
@@ -67,25 +79,32 @@
     private static final String APPADMIN_GROUP_SUFFIX_LOWWER = APPADMIN_GROUP_SUFFIX.toLowerCase();
     private static final String[] RETURN_ADMINROLE = new String[] { "administrativeRole" };
 
-    private static final Collection ADD_BYPASS;
-    private static final Collection DEL_BYPASS;
-    static final Collection LOOKUP_BYPASS;
+    private static final Collection<String> ADD_BYPASS;
+    private static final Collection<String> DEL_BYPASS;
+    static final Collection<String> LOOKUP_BYPASS;
 
     static
     {
-        Collection c = new HashSet();
-        c.add( "normalizationService" );
-        c.add( "authenticationService" );
-        c.add( "defaultAuthorizationService" );
-        c.add( "schemaService" );
-        c.add( "policyProtectionService" );
-        c.add( "collectiveAttributeService" );
+        Collection<String> c = new HashSet<String>();
+        c.add( NormalizationService.class.getName() );
+        c.add( AuthenticationService.class.getName() );
+//        c.add( ReferralService.class.getName() );
+        c.add( AuthorizationService.class.getName() );
+//        c.add( DefaultAuthorizationService.class.getName() );
+//        c.add( ExceptionService.class.getName() );
+//        c.add( OperationalAttributeService.class.getName() );
+        c.add( SchemaService.class.getName() );
+//        c.add( SubentryService.class.getName() );
+        c.add( PolicyProtectionInterceptor.class.getName() );
+        c.add( CollectiveAttributeService.class.getName() );
+//        c.add( EventService.class.getName() );
+//        c.add( TriggerService.class.getName() );
         ADD_BYPASS = Collections.unmodifiableCollection( c );
         DEL_BYPASS = Collections.unmodifiableCollection( c );
 
-        c = new HashSet();
+        c = new HashSet<String>();
         c.addAll( PartitionNexusProxy.LOOKUP_BYPASS );
-        c.add( "policyProtectionService" );
+        c.add( PolicyProtectionInterceptor.class.getName() );
         LOOKUP_BYPASS = Collections.unmodifiableCollection( c );
     }
 
@@ -94,13 +113,13 @@
     /** LUT of normalized suffix DNs which are already ASCAs */
     private final Set acsaLut = new HashSet();
 
-    private final AttributeTypeRegistry registry;
+    private final Map<String, OidNormalizer> normalizerMap;
     private final AttributeType administrativeRoleType;
     
     
     public ApplicationAciManager( AttributeTypeRegistry registry ) throws NamingException
     {
-        this.registry = registry;
+        this.normalizerMap = registry.getNormalizerMapping();
         administrativeRoleType = registry.lookup( "administrativeRole" );
     }
     
@@ -189,7 +208,7 @@
         OperationContext groupContext = new DeleteOperationContext(groupDn);
 
         // blow away the group entry
-        groupDn.normalize( registry.getNormalizerMapping() );
+        groupDn.normalize( normalizerMap );
         proxy.delete( groupContext, DEL_BYPASS );
     }
 
@@ -213,7 +232,7 @@
         // calculate the names of the group container and create ou=groups if we have to
         LdapDN groupDn = ( LdapDN ) suffix.clone();
         groupDn.add( "ou=groups" );
-        groupDn.normalize( registry.getNormalizerMapping() );
+        groupDn.normalize( normalizerMap );
         // continue building the name for the new group entry off of ou=groups
         StringBuffer buf = new StringBuffer();
         Attribute cnAttr = new AttributeImpl( "cn" );
@@ -222,7 +241,7 @@
         cnAttr.add( buf.toString() );
         buf.insert( 0, "cn=" );
         groupDn.add( buf.toString() );
-        groupDn.normalize( registry.getNormalizerMapping() );
+        groupDn.normalize( normalizerMap );
 
         // create the admin group entry
         Attributes group = new AttributesImpl();
@@ -291,7 +310,7 @@
         subentryDn.add( buf.toString() );
 
         // delete the access control subentry
-        subentryDn.normalize( registry.getNormalizerMapping() );
+        subentryDn.normalize( normalizerMap );
         OperationContext deleteContext = new DeleteOperationContext( subentryDn );
         proxy.delete( deleteContext, DEL_BYPASS );
     }
@@ -323,7 +342,7 @@
         groupRdn.append( appUpName );
         groupRdn.append( APPADMIN_GROUP_SUFFIX );
         groupDn.add( groupRdn.toString() );
-        groupDn.normalize( registry.getNormalizerMapping() );
+        groupDn.normalize( normalizerMap );
 
         // calculate the name for the new subentry to create
         StringBuffer buf = new StringBuffer();
@@ -355,7 +374,7 @@
         buf.append( APP_ACITAG_SUFFIX );
         LdapDN subentryDn = ( LdapDN ) suffix.clone();
         subentryDn.add( buf.toString() );
-        subentryDn.normalize( registry.getNormalizerMapping() );
+        subentryDn.normalize( normalizerMap );
         OperationContext addContext = new AddOperationContext(subentryDn, subentry);
         proxy.add( addContext, ADD_BYPASS );
     }

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/java/org/apache/directory/triplesec/store/interceptor/PolicyProtectionInterceptor.java Mon Aug 20 23:39:41 2007
@@ -54,6 +54,8 @@
  *
  * IN other words, programmatic referential integrity
  *
+ * @org.apache.xbean.XBean
+ *
  * @author Trustin Lee
  * @version $Rev: 956 $, $Date: 2006-09-21 10:10:21 -0400 (Thu, 21 Sep 2006) $
  */

Modified: directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/triplesec.schema
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/triplesec.schema?rev=567977&r1=567976&r2=567977&view=diff
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/triplesec.schema (original)
+++ directory/sandbox/djencks/triplesec-jacc2/store/src/main/schema/triplesec.schema Mon Aug 20 23:39:41 2007
@@ -114,7 +114,7 @@
     AUXILIARY
     MUST (  triplesecUid $ triplesecRealm $ triplesecLabel $ triplesecSecret $
             triplesecFactor $ triplesecResynchCount $ triplesecFailuresInEpoch $ triplesecNotifyBy )
-    MAY  ( triplesecInfo $ triplesecActivationKey $ triplesecMidletName $ triplesecDisabled ) )
+    MAY  ( triplesecInfo $ triplesecActivationKey $ triplesecMidletName $ triplesecDisabled $ triplesecTokenPin) )
 
 
 # -----------------------------------------------------------------------------



Mime
View raw message