Return-Path: 
 <scm-return-25837-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 78174 invoked from network); 1 Mar 2008 18:16:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Mar 2008 18:16:50 -0000
Received: (qmail 51363 invoked by uid 500); 1 Mar 2008 18:16:46 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 51245 invoked by uid 500); 1 Mar 2008 18:16:45 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 51236 invoked by uid 99); 1 Mar 2008 18:16:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2008 10:16:45 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2008 18:16:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B65B31A9832; Sat,  1 Mar 2008 10:16:21 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r632641 - in /geronimo/plugins/directory/branches/2.0: ./
 directory/ directory/src/main/plan/ directory/src/main/resources/META-INF/
 directory/src/plan/ geronimo-directory/
 geronimo-directory/src/test/resources/
Date: Sat, 01 Mar 2008 18:16:19 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080301181621.B65B31A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Sat Mar  1 10:16:18 2008
New Revision: 632641

URL: http://svn.apache.org/viewvc?rev=632641&view=rev
Log:
closer to release.  Uses (unreleased) genesis 1.4

Added:
    geronimo/plugins/directory/branches/2.0/directory/src/main/plan/
      - copied from r632629, geronimo/plugins/directory/branches/2.0/directory/src/plan/
Removed:
    geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/directory/branches/2.0/directory/src/plan/
Modified:
    geronimo/plugins/directory/branches/2.0/directory/pom.xml
    geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/server.xml
    geronimo/plugins/directory/branches/2.0/geronimo-directory/pom.xml
    geronimo/plugins/directory/branches/2.0/geronimo-directory/src/test/resources/server.xml
    geronimo/plugins/directory/branches/2.0/pom.xml

Modified: geronimo/plugins/directory/branches/2.0/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/directory/pom.xml?rev=632641&r1=632640&r2=632641&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/2.0/directory/pom.xml Sat Mar  1 10:16:18 2008
@@ -25,14 +25,25 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>directory-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>directory</artifactId>
-    <name>Geronimo Plugins :: Apache Directory Server</name>
+    <name>Geronimo Apache Directory Server Plugin</name>
     <packaging>car</packaging>
-    
+    <description>
+        This plugin integrates the Apache Directory Server (ApacheDS)
+        LDAP server with Geronimo. That means that Geronimo will run
+        an embedded LDAP server when it starts. This LDAP server may
+        be used for LDAP security realms within Geronimo, as well as
+        for other purposes by Geronimo applications or by remote
+        applications.
+
+        For more information on the ApacheDS project, see
+        http://directory.apache.org
+    </description>
+
     <dependencies>
         
         <dependency>
@@ -199,12 +210,15 @@
           <groupId>jdbm</groupId>
           <artifactId>jdbm</artifactId>
         </dependency>
-    </dependencies>
 
-    <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>${version}</geronimoVersion>
-    </properties>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
     
     <build>
         <!--
@@ -222,7 +236,7 @@
 
         <plugins>
             <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
 
                 <!-- Install as extention to allow 'car' packaging to be used. -->
@@ -233,6 +247,28 @@
                         <!-- Do not include META-INF/maven to avoid long file problems on windows -->
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
+
+                    <category>LDAP</category>
+                    <osiApproved>true</osiApproved>
+
+
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <copy-file relative-to="server" dest-dir="var/directory">META-INF/server.xml</copy-file>
+                            <config-xml-content>
+                               <gbean name="DirectoryService">
+                                    <attribute name="configFile">var/directory/server.xml</attribute>
+                                    <attribute name="workingDir">var/directory</attribute>
+                                    <attribute name="providerURL">${providerURL}</attribute>
+                                </gbean>
+                            </config-xml-content>
+                            <config-substitution key="providerURL">ou=system</config-substitution>
+                        </plugin-artifact>
+                    </instance>
                 </configuration>
             </plugin>
         </plugins>
@@ -243,5 +279,5 @@
             </resource>
         </resources>
     </build>
-    
+        
 </project>

Modified: geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/server.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/server.xml?rev=632641&r1=632640&r2=632641&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/server.xml (original)
+++ geronimo/plugins/directory/branches/2.0/directory/src/main/resources/META-INF/server.xml Sat Mar  1 10:16:18 2008
@@ -7,29 +7,127 @@
   <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>
-        <!--<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>-->
         <!-- Set this key to a space delimited set of attributeType descriptions
-             and their OID's if you want an attributeType to be handled as 
+             and their OID's if you want an attributeType to be handled as
              binary content.
- 
+
              The server will use the schema to derive the set of attributeTypes
-             to treat as binary.  The union if the values you provide here 
-             will be taken as the set of binaries. Note to be consistent you 
+             to treat as binary.  The union if the values you provide here
+             will be taken as the set of binaries. Note to be consistent you
              must add both the OID and all the names an attributeType can have.
         -->
-        <!-- 
+        <!--
         <prop key="java.naming.ldap.attributes.binary"></prop>
         -->
       </props>
     </property>
   </bean>
-  
+
+  <bean id="changePasswordConfiguration" class="org.apache.directory.server.changepw.ChangePasswordConfiguration">
+    <!-- Whether to enable the Change Password protocol.                    -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the Change Password protocol on.                   -->
+    <property name="ipPort" value="464" />
+  </bean>
+
+  <bean id="ntpConfiguration" class="org.apache.directory.server.ntp.NtpConfiguration">
+    <!-- Whether to enable the NTP protocol.                                -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the NTP protocol on.                               -->
+    <property name="ipPort" value="123" />
+  </bean>
+
+  <bean id="dnsConfiguration" class="org.apache.directory.server.dns.DnsConfiguration">
+    <!-- Whether to enable the DNS protocol.                                -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the DNS protocol on.                               -->
+    <property name="ipPort" value="53" />
+  </bean>
+
+  <bean id="kdcConfiguration" class="org.apache.directory.server.kerberos.kdc.KdcConfiguration">
+    <!-- Whether to enable the Kerberos protocol.                           -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the Kerberos protocol on.                          -->
+    <property name="ipPort" value="88" />
+  </bean>
+
+  <bean id="ldapsConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+    <!-- Whether to enable the LDAPS protocol.                               -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the LDAPS protocol on.                              -->
+    <property name="ipPort" value="636" />
+
+    <property name="enableLdaps" value="true" />
+  </bean>
+
+  <bean id="ldapConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+    <!-- The port to run the LDAP protocol on.                              -->
+    <property name="ipPort" value="10389" />
+    <!-- Whether to allow anonymous access.                                 -->
+    <property name="allowAnonymousAccess" value="false" />
+
+    <!-- The list of supported authentication mechanisms.                   -->
+    <property name="supportedMechanisms">
+      <list>
+        <value>SIMPLE</value>
+        <value>CRAM-MD5</value>
+        <value>DIGEST-MD5</value>
+        <!--<value>GSSAPI</value>-->
+      </list>
+    </property>
+
+    <!-- The FQDN of this SASL host, validated during SASL negotiation.     -->
+    <property name="saslHost" value="ldap.example.com" />
+
+    <!-- The Kerberos principal name for this LDAP service, used by GSSAPI. -->
+    <property name="saslPrincipal" value="ldap/ldap.example.com@EXAMPLE.COM" />
+
+    <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI.  -->
+    <property name="saslQop">
+      <list>
+        <value>auth</value>
+        <value>auth-int</value>
+        <value>auth-conf</value>
+      </list>
+    </property>
+
+    <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
+    <property name="saslRealms">
+      <list>
+        <value>example.com</value>
+        <value>apache.org</value>
+      </list>
+    </property>
+
+    <!-- The base DN containing users that can be SASL authenticated.       -->
+    <property name="searchBaseDn" value="ou=users,ou=system" />
+
+    <!-- SSL CONFIG CAN GO HERE-->
+
+    <!-- limits searches by non-admin users to a max time of 15000          -->
+    <!-- milliseconds and has a default value of 10000                      -->
+    <property name="maxTimeLimit" value="15000" />
+
+    <!-- limits searches to max size of 1000 entries: default value is 100  -->
+    <property name="maxSizeLimit" value="1000" />
+
+    <!-- the collection of extended operation handlers to install           -->
+    <property name="extendedOperationHandlers">
+      <list>
+        <!--<bean class="org.apache.directory.server.ldap.support.starttls.StartTlsHandler"/>-->
+        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+        <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.
+        <bean class="org.apache.directory.server.ldap.support.extended.StoredProcedureExtendedOperationHandler"/>
+        -->
+      </list>
+    </property>
+  </bean>
+
   <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
     <property name="workingDirectory" value="example.com" />
 
@@ -38,19 +136,19 @@
     <!-- 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.                                 -->
-
-    <!--<property name="ldifDirectory">
-      <value>example.ldif</value>
+    <property name="ldifDirectory">
+      <value>ldif</value>
     </property>
+
+    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
+    <!-- order specified.                                                   -->
+    <!--
     <property name="ldifFilters">
       <list>
-        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+        <bean class="com.example.MyEntryFilter"/>
       </list>
-    </property>-->
+    </property>
+    -->
 
     <!-- the number of milliseconds before issuing a synch (flush to disk)  -->
     <!-- which writes out dirty pages back to disk.  To turn off synchs all -->
@@ -59,28 +157,20 @@
     <!-- writes may never persist to disk.                                  -->
     <property name="synchPeriodMillis" value="15000" />
 
-    <!-- limits searches by non-admin users to a max time of 15000          -->
-    <!-- milliseconds and has a default value of 10000                      -->
-    <property name="maxTimeLimit" value="15000" />
-    <!-- limits searches to max size of 1000 entries: default value is 100  -->
-    <property name="maxSizeLimit" value="1000" />
     <!-- maximum number of threads used by mina is set to 8: default is 4   -->
     <property name="maxThreads" value="8" />
 
     <property name="allowAnonymousAccess" value="false" />
     <property name="accessControlEnabled" value="false" />
-    <property name="enableNtp" value="false" />
-    <property name="enableKerberos" value="false" />
-    <property name="enableChangePassword" value="false" />
 
     <!--
        It's more efficient to keep this feature turned off but you may not like
        having the creatorsName and modifiersName contain OIDs instead of short
        attributeType names instead.  So if you want the creatorsName to change
-       from the normalized form which is the internal representation of 
-           
+       from the normalized form which is the internal representation of
+
             '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
-       
+
        to a more human readabile form like:
 
             'uid=admin,ou=system'
@@ -89,7 +179,12 @@
     -->
     <property name="denormalizeOpAttrsEnabled" value="false" />
 
-    <property name="ldapPort" value="10389" />
+    <property name="ntpConfiguration" ref="ntpConfiguration" />
+    <property name="dnsConfiguration" ref="dnsConfiguration" />
+    <property name="changePasswordConfiguration" ref="changePasswordConfiguration" />
+    <property name="kdcConfiguration" ref="kdcConfiguration" />
+    <property name="ldapConfiguration" ref="ldapConfiguration" />
+    <property name="ldapsConfiguration" ref="ldapsConfiguration" />
 
     <property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
 
@@ -98,101 +193,98 @@
         <ref bean="examplePartitionConfiguration"/>
       </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" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.normalization.NormalizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="authenticationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authn.AuthenticationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="referralService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.referral.ReferralService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.referral.ReferralService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="authorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authz.AuthorizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="defaultAuthorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="exceptionService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.exception.ExceptionService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="operationalAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.operational.OperationalAttributeService" />
+        </bean>
+        <!-- Uncomment to enable the password policy service
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="passwordPolicyService" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.kerberos.PasswordPolicyService" />
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="keyDerivationService" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.kerberos.KeyDerivationService" />
         </bean>
+        -->
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="schemaService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.schema.SchemaService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.schema.SchemaService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="subentryService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.subtree.SubentryService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="collectiveAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.collective.CollectiveAttributeService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="eventService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.event.EventService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.event.EventService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="triggerService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.trigger.TriggerService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.trigger.TriggerService" />
         </bean>
 
         <!-- Uncomment to enable replication service
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+        <bean class="org.apache.directory.mitosis.configuration.MutableReplicationInterceptorConfiguration">
           <property name="name" value="replicationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.mitosis.service.ReplicationService">
-              <property name="configuration">
-                <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
-                  <property name="replicaId" value="instance_a" />
-                  <property name="serverPort" value="10390" />
-                  <property name="peerReplicas" value="instance_b@localhost:10392" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.mitosis.service.ReplicationService" />
+          <property name="replicationConfiguration">
+            <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
+              <property name="replicaId">
+                <bean class="org.apache.directory.mitosis.common.ReplicaId">
+                  <constructor-arg>
+                    <value>instance_a</value>
+                  </constructor-arg>
                 </bean>
               </property>
+              <property name="serverPort" value="10390" />
+              <property name="peerReplicas" value="instance_b@localhost:10392" />
             </bean>
           </property>
         </bean>
@@ -200,21 +292,22 @@
       </list>
     </property>
   </bean>
-  
+
   <!-- use the following partitionConfiguration to override defaults for  -->
-  <!-- the system partition                                               --> 
+  <!-- the system partition                                               -->
   <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="system" />
+    <property name="id" value="system" />
     <property name="cacheSize" value="100" />
     <property name="suffix" value="ou=system" />
-
+    <property name="partitionClassName"
+      value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
     <!-- the optimizer is enabled by default but may not always be what     -->
     <!-- you want if your queries are really simple                         -->
     <property name="optimizerEnabled" value="true" />
 
     <!--
       Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
+      to flush dirty pages.  Writes persist immediately to disk at
       a cost to performance with increased data integrity.  Otherwise
       the periodic synch operation will flush dirty pages using the
       synchPeriodMillis parameter in the main configuration.
@@ -250,7 +343,6 @@
           <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
           <property name="cacheSize" value="10" />
         </bean>
-
         <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
           <property name="attributeId" value="ou" />
           <property name="cacheSize" value="100" />
@@ -277,9 +369,11 @@
 
 
   <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="example" />
+    <property name="id" value="example" />
     <property name="cacheSize" value="100" />
     <property name="suffix" value="dc=example,dc=com" />
+    <property name="partitionClassName"
+      value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
 
     <!-- the optimizer is enabled by default but may not always be what     -->
     <!-- you want if your queries are really simple                         -->
@@ -287,7 +381,7 @@
 
     <!--
       Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
+      to flush dirty pages.  Writes persist immediately to disk at
       a cost to performance with increased data integrity.  Otherwise
       the periodic synch operation will flush dirty pages using the
       synchPeriodMillis parameter in the main configuration.

Modified: geronimo/plugins/directory/branches/2.0/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/geronimo-directory/pom.xml?rev=632641&r1=632640&r2=632641&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/geronimo-directory/pom.xml (original)
+++ geronimo/plugins/directory/branches/2.0/geronimo-directory/pom.xml Sat Mar  1 10:16:18 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>directory-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,7 +36,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
         </dependency>
 
@@ -88,6 +88,12 @@
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.directory.server</groupId>
+            <artifactId>apacheds-bootstrap-partition</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

Modified: geronimo/plugins/directory/branches/2.0/geronimo-directory/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/geronimo-directory/src/test/resources/server.xml?rev=632641&r1=632640&r2=632641&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/geronimo-directory/src/test/resources/server.xml (original)
+++ geronimo/plugins/directory/branches/2.0/geronimo-directory/src/test/resources/server.xml Sat Mar  1 10:16:18 2008
@@ -7,29 +7,127 @@
   <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>
-        <!--<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>-->
         <!-- Set this key to a space delimited set of attributeType descriptions
-             and their OID's if you want an attributeType to be handled as 
+             and their OID's if you want an attributeType to be handled as
              binary content.
- 
+
              The server will use the schema to derive the set of attributeTypes
-             to treat as binary.  The union if the values you provide here 
-             will be taken as the set of binaries. Note to be consistent you 
+             to treat as binary.  The union if the values you provide here
+             will be taken as the set of binaries. Note to be consistent you
              must add both the OID and all the names an attributeType can have.
         -->
-        <!-- 
+        <!--
         <prop key="java.naming.ldap.attributes.binary"></prop>
         -->
       </props>
     </property>
   </bean>
-  
+
+  <bean id="changePasswordConfiguration" class="org.apache.directory.server.changepw.ChangePasswordConfiguration">
+    <!-- Whether to enable the Change Password protocol.                    -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the Change Password protocol on.                   -->
+    <property name="ipPort" value="464" />
+  </bean>
+
+  <bean id="ntpConfiguration" class="org.apache.directory.server.ntp.NtpConfiguration">
+    <!-- Whether to enable the NTP protocol.                                -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the NTP protocol on.                               -->
+    <property name="ipPort" value="123" />
+  </bean>
+
+  <bean id="dnsConfiguration" class="org.apache.directory.server.dns.DnsConfiguration">
+    <!-- Whether to enable the DNS protocol.                                -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the DNS protocol on.                               -->
+    <property name="ipPort" value="53" />
+  </bean>
+
+  <bean id="kdcConfiguration" class="org.apache.directory.server.kerberos.kdc.KdcConfiguration">
+    <!-- Whether to enable the Kerberos protocol.                           -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the Kerberos protocol on.                          -->
+    <property name="ipPort" value="88" />
+  </bean>
+
+  <bean id="ldapsConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+    <!-- Whether to enable the LDAPS protocol.                               -->
+    <property name="enabled" value="false" />
+    <!-- The port to run the LDAPS protocol on.                              -->
+    <property name="ipPort" value="636" />
+
+    <property name="enableLdaps" value="true" />
+  </bean>
+
+  <bean id="ldapConfiguration" class="org.apache.directory.server.ldap.LdapConfiguration">
+    <!-- The port to run the LDAP protocol on.                              -->
+    <property name="ipPort" value="10389" />
+    <!-- Whether to allow anonymous access.                                 -->
+    <property name="allowAnonymousAccess" value="false" />
+
+    <!-- The list of supported authentication mechanisms.                   -->
+    <property name="supportedMechanisms">
+      <list>
+        <value>SIMPLE</value>
+        <value>CRAM-MD5</value>
+        <value>DIGEST-MD5</value>
+        <!--<value>GSSAPI</value>-->
+      </list>
+    </property>
+
+    <!-- The FQDN of this SASL host, validated during SASL negotiation.     -->
+    <property name="saslHost" value="ldap.example.com" />
+
+    <!-- The Kerberos principal name for this LDAP service, used by GSSAPI. -->
+    <property name="saslPrincipal" value="ldap/ldap.example.com@EXAMPLE.COM" />
+
+    <!-- The desired quality-of-protection, used by DIGEST-MD5 and GSSAPI.  -->
+    <property name="saslQop">
+      <list>
+        <value>auth</value>
+        <value>auth-int</value>
+        <value>auth-conf</value>
+      </list>
+    </property>
+
+    <!-- The realms serviced by this SASL host, used by DIGEST-MD5 and GSSAPI. -->
+    <property name="saslRealms">
+      <list>
+        <value>example.com</value>
+        <value>apache.org</value>
+      </list>
+    </property>
+
+    <!-- The base DN containing users that can be SASL authenticated.       -->
+    <property name="searchBaseDn" value="ou=users,ou=system" />
+
+    <!-- SSL CONFIG CAN GO HERE-->
+
+    <!-- limits searches by non-admin users to a max time of 15000          -->
+    <!-- milliseconds and has a default value of 10000                      -->
+    <property name="maxTimeLimit" value="15000" />
+
+    <!-- limits searches to max size of 1000 entries: default value is 100  -->
+    <property name="maxSizeLimit" value="1000" />
+
+    <!-- the collection of extended operation handlers to install           -->
+    <property name="extendedOperationHandlers">
+      <list>
+        <!--<bean class="org.apache.directory.server.ldap.support.starttls.StartTlsHandler"/>-->
+        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+        <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.
+        <bean class="org.apache.directory.server.ldap.support.extended.StoredProcedureExtendedOperationHandler"/>
+        -->
+      </list>
+    </property>
+  </bean>
+
   <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
     <property name="workingDirectory" value="example.com" />
 
@@ -38,19 +136,19 @@
     <!-- 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.                                 -->
-
-    <!--<property name="ldifDirectory">
-      <value>example.ldif</value>
+    <property name="ldifDirectory">
+      <value>ldif</value>
     </property>
+
+    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
+    <!-- order specified.                                                   -->
+    <!--
     <property name="ldifFilters">
       <list>
-        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+        <bean class="com.example.MyEntryFilter"/>
       </list>
-    </property>-->
+    </property>
+    -->
 
     <!-- the number of milliseconds before issuing a synch (flush to disk)  -->
     <!-- which writes out dirty pages back to disk.  To turn off synchs all -->
@@ -59,28 +157,20 @@
     <!-- writes may never persist to disk.                                  -->
     <property name="synchPeriodMillis" value="15000" />
 
-    <!-- limits searches by non-admin users to a max time of 15000          -->
-    <!-- milliseconds and has a default value of 10000                      -->
-    <property name="maxTimeLimit" value="15000" />
-    <!-- limits searches to max size of 1000 entries: default value is 100  -->
-    <property name="maxSizeLimit" value="1000" />
     <!-- maximum number of threads used by mina is set to 8: default is 4   -->
     <property name="maxThreads" value="8" />
 
     <property name="allowAnonymousAccess" value="false" />
     <property name="accessControlEnabled" value="false" />
-    <property name="enableNtp" value="false" />
-    <property name="enableKerberos" value="false" />
-    <property name="enableChangePassword" value="false" />
 
     <!--
        It's more efficient to keep this feature turned off but you may not like
        having the creatorsName and modifiersName contain OIDs instead of short
        attributeType names instead.  So if you want the creatorsName to change
-       from the normalized form which is the internal representation of 
-           
+       from the normalized form which is the internal representation of
+
             '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
-       
+
        to a more human readabile form like:
 
             'uid=admin,ou=system'
@@ -89,7 +179,12 @@
     -->
     <property name="denormalizeOpAttrsEnabled" value="false" />
 
-    <property name="ldapPort" value="10389" />
+    <property name="ntpConfiguration" ref="ntpConfiguration" />
+    <property name="dnsConfiguration" ref="dnsConfiguration" />
+    <property name="changePasswordConfiguration" ref="changePasswordConfiguration" />
+    <property name="kdcConfiguration" ref="kdcConfiguration" />
+    <property name="ldapConfiguration" ref="ldapConfiguration" />
+    <property name="ldapsConfiguration" ref="ldapsConfiguration" />
 
     <property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
 
@@ -98,101 +193,98 @@
         <ref bean="examplePartitionConfiguration"/>
       </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" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.normalization.NormalizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="authenticationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authn.AuthenticationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="referralService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.referral.ReferralService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.referral.ReferralService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="authorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authz.AuthorizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="defaultAuthorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="exceptionService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.exception.ExceptionService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="operationalAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.operational.OperationalAttributeService" />
+        </bean>
+        <!-- Uncomment to enable the password policy service
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="passwordPolicyService" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.kerberos.PasswordPolicyService" />
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="keyDerivationService" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.kerberos.KeyDerivationService" />
         </bean>
+        -->
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="schemaService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.schema.SchemaService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.schema.SchemaService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="subentryService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.subtree.SubentryService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="collectiveAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.collective.CollectiveAttributeService" />
         </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="eventService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.event.EventService" />
-          </property>
-        </bean>                        
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.event.EventService" />
+        </bean>
         <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
           <property name="name" value="triggerService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.trigger.TriggerService" />
-          </property>
+          <property name="interceptorClassName"
+            value="org.apache.directory.server.core.trigger.TriggerService" />
         </bean>
 
         <!-- Uncomment to enable replication service
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+        <bean class="org.apache.directory.mitosis.configuration.MutableReplicationInterceptorConfiguration">
           <property name="name" value="replicationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.mitosis.service.ReplicationService">
-              <property name="configuration">
-                <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
-                  <property name="replicaId" value="instance_a" />
-                  <property name="serverPort" value="10390" />
-                  <property name="peerReplicas" value="instance_b@localhost:10392" />
+          <property name="interceptorClassName"
+            value="org.apache.directory.mitosis.service.ReplicationService" />
+          <property name="replicationConfiguration">
+            <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
+              <property name="replicaId">
+                <bean class="org.apache.directory.mitosis.common.ReplicaId">
+                  <constructor-arg>
+                    <value>instance_a</value>
+                  </constructor-arg>
                 </bean>
               </property>
+              <property name="serverPort" value="10390" />
+              <property name="peerReplicas" value="instance_b@localhost:10392" />
             </bean>
           </property>
         </bean>
@@ -200,21 +292,22 @@
       </list>
     </property>
   </bean>
-  
+
   <!-- use the following partitionConfiguration to override defaults for  -->
-  <!-- the system partition                                               --> 
+  <!-- the system partition                                               -->
   <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="system" />
+    <property name="id" value="system" />
     <property name="cacheSize" value="100" />
     <property name="suffix" value="ou=system" />
-
+    <property name="partitionClassName"
+      value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
     <!-- the optimizer is enabled by default but may not always be what     -->
     <!-- you want if your queries are really simple                         -->
     <property name="optimizerEnabled" value="true" />
 
     <!--
       Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
+      to flush dirty pages.  Writes persist immediately to disk at
       a cost to performance with increased data integrity.  Otherwise
       the periodic synch operation will flush dirty pages using the
       synchPeriodMillis parameter in the main configuration.
@@ -250,7 +343,6 @@
           <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
           <property name="cacheSize" value="10" />
         </bean>
-
         <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
           <property name="attributeId" value="ou" />
           <property name="cacheSize" value="100" />
@@ -277,9 +369,11 @@
 
 
   <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="example" />
+    <property name="id" value="example" />
     <property name="cacheSize" value="100" />
     <property name="suffix" value="dc=example,dc=com" />
+    <property name="partitionClassName"
+      value="org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition" />
 
     <!-- the optimizer is enabled by default but may not always be what     -->
     <!-- you want if your queries are really simple                         -->
@@ -287,7 +381,7 @@
 
     <!--
       Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
+      to flush dirty pages.  Writes persist immediately to disk at
       a cost to performance with increased data integrity.  Otherwise
       the periodic synch operation will flush dirty pages using the
       synchPeriodMillis parameter in the main configuration.

Modified: geronimo/plugins/directory/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/2.0/pom.xml?rev=632641&r1=632640&r2=632641&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/2.0/pom.xml (original)
+++ geronimo/plugins/directory/branches/2.0/pom.xml Sat Mar  1 10:16:18 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <version>1.4</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
@@ -33,7 +33,7 @@
     <name>Geronimo Apache Directory Integration</name>
     <packaging>pom</packaging>
 
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
 
     <description>
         Integration of the Apache Directory Server into Apache Geronimo
@@ -54,7 +54,10 @@
               element, and it will need to be changed manually before a release,
               as the maven-release-plugin will not update this value.
         -->
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
+
+        <!-- This property is required by the car:package mojo -->
+        <geronimoVersion>2.1</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
     </properties>
@@ -72,15 +75,15 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
+                <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-system</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.configs</groupId>
                 <artifactId>j2ee-server</artifactId>
-                <version>2.1-SNAPSHOT</version>
+                <version>${geronimoVersion}</version>
                 <type>car</type>
             </dependency>
 
@@ -133,149 +136,149 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-server-jndi</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-bootstrap-extract</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-bootstrap-partition</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-btree-base</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-core</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-core-shared</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-jdbm-store</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-schema-bootstrap</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-schema-registries</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-utils</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-kerberos-shared</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-changepw</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <!--<dependency>-->
             <!--<groupId>org.apache.directory.server</groupId>-->
             <!--<artifactId>apacheds-protocol-dhcp</artifactId>-->
-            <!--<version>1.5.0</version>-->
+            <!--<version>1.5.1</version>-->
             <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-dns</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-kerberos</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-ldap</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-ntp</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-shared</artifactId>
-                <version>1.5.0</version>
+                <version>1.5.1</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.daemon</groupId>
                 <artifactId>daemon-bootstrappers</artifactId>
-                <version>1.1.0</version>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-ldap</artifactId>
-                <version>0.9.6</version>
+                <version>0.9.7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-asn1</artifactId>
-                <version>0.9.6</version>
+                <version>0.9.7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-asn1-codec</artifactId>
-                <version>0.9.6</version>
+                <version>0.9.7</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
-                <version>1.0.2</version>
+                <version>1.1.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-filter-ssl</artifactId>
-                <version>1.0.2</version>
+                <version>1.1.2</version>
             </dependency>
 
             <dependency>
@@ -287,7 +290,7 @@
             <dependency>
               <groupId>commons-collections</groupId>
               <artifactId>commons-collections</artifactId>
-              <version>3.1</version>
+              <version>3.2</version>
             </dependency>
 
             <dependency>
@@ -301,6 +304,15 @@
               <artifactId>jdbm</artifactId>
               <version>1.0</version>
             </dependency>
+
+
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <type>car</type>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -308,9 +320,9 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>car-maven-plugin</artifactId>
-                    <version>${version}</version>
+                    <version>${geronimoVersion}</version>
                     <extensions>true</extensions>
                 </plugin>
 
@@ -575,6 +587,29 @@
                     </plugin>
                 </plugins>
             </build>
+        </profile>
+
+        <profile>
+            <id>release</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                          <tagBase>https://svn.apache.org/repos/asf/geronimo/plugins/directory/tags</tagBase>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>with-assembly</id>
+            <modules>
+                <module>geronimo-directory-server</module>
+            </modules>
         </profile>
     </profiles>