Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r708950 [2/2] - in
 /geronimo/plugins/directory/branches/1.0: ./
 directory/ directory/src/main/plan/ directory/src/main/resources/META-INF/
 geronimo-directory-server/ geronimo-directory/
 geronimo-directory/src/main/java/org/apache/geronimo/d...
Date: Wed, 29 Oct 2008 17:45:56 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
Message-Id: <20081029174557.712FB238895D@eris.apache.org>

Modified: geronimo/plugins/directory/branches/1.0/geronimo-directory/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/geronimo-directory/src/test/resources/server.xml?rev=708950&r1=708949&r2=708950&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/geronimo-directory/src/test/resources/server.xml (original)
+++ geronimo/plugins/directory/branches/1.0/geronimo-directory/src/test/resources/server.xml Wed Oct 29 10:45:56 2008
@@ -1,479 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
 -->
-<!-- $Rev$ $Date$ -->
 
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-  "http://www.springframework.org/dtd/spring-beans.dtd">
 
-<beans>
-  <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>
-        <!-- Set this key to a space delimited set of attributeType descriptions
-             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
-             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" />
+<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" 
+			  xmlns:s="http://www.springframework.org/schema/beans"
+			  xmlns="http://apacheds.org/config/1.0">
+
+  <defaultDirectoryService id="directoryService" instanceId="default"
+                           workingDirectory="example.com"
+                           allowAnonymousAccess="true"
+                           accessControlEnabled="false"
+                           denormalizeOpAttrsEnabled="false">
+    <systemPartition>
+      <!-- use the following partitionConfiguration to override defaults for -->
+      <!-- the system partition                                              -->
+      <jdbmPartition id="system" cacheSize="100" suffix="ou=system" optimizerEnabled="true" syncOnWrite="true">
+        <indexedAttributes>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.3" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.4" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.5" cacheSize="10"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.6" cacheSize="10"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.7" cacheSize="10"/>
+          <jdbmIndex attributeId="ou" cacheSize="100"/>
+          <jdbmIndex attributeId="uid" cacheSize="100"/>
+          <jdbmIndex attributeId="objectClass" cacheSize="100"/>
+        </indexedAttributes>
+      </jdbmPartition>
+    </systemPartition>
+
+    <partitions>
+      <!-- NOTE: when specifying new partitions you need not include those   -->
+      <!-- attributes below with OID's which are the system indices, if left -->
+      <!-- out they will be automatically configured for you with defaults.  -->
+      <jdbmPartition id="example" cacheSize="100" suffix="dc=example,dc=com" optimizerEnabled="true"
+                     syncOnWrite="true">
+        <indexedAttributes>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.1" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.2" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.3" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.4" cacheSize="100"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.5" cacheSize="10"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.6" cacheSize="10"/>
+          <jdbmIndex attributeId="1.3.6.1.4.1.18060.0.4.1.2.7" cacheSize="10"/>
+          <jdbmIndex attributeId="dc" cacheSize="100"/>
+          <jdbmIndex attributeId="ou" cacheSize="100"/>
+          <jdbmIndex attributeId="krb5PrincipalName" cacheSize="100"/>
+          <jdbmIndex attributeId="uid" cacheSize="100"/>
+          <jdbmIndex attributeId="objectClass" cacheSize="100"/>
+        </indexedAttributes>
+      </jdbmPartition>
+    </partitions>
+
+    <interceptors>
+      <normalizationInterceptor/>
+      <authenticationInterceptor/>
+      <aciAuthorizationInterceptor/>
+      <defaultAuthorizationInterceptor/>
+      <exceptionInterceptor/>
+      <operationalAttributeInterceptor/>
+
+      <!-- Uncomment to enable the password policy interceptor
+      <passwordPolicyInterceptor/>
+      <keyDerivationInterceptor/>
+      -->
+
+      <schemaInterceptor/>
+      <subentryInterceptor/>
+      <collectiveAttributeInterceptor/>
+      <eventInterceptor/>
+      <triggerInterceptor/>
+
+      <!-- Uncomment to enable replication interceptor
+      <replicationInterceptor>
+        <configuration>
+          <replicationConfiguration serverPort="10390" peerReplicas="instance_b@localhost:10392">
+            <replicaId>
+              <replicaId id="instance_a"/>
+            </replicaId>
+          </replicationConfiguration>
+        </configuration>
+      </replicationInterceptor>
+      -->
+    </interceptors>
+  </defaultDirectoryService>
+
+  <standardThreadPool id="standardThreadPool" maxThreads="8"/>
+  <datagramAcceptor id="datagramAcceptor" logicExecutor="#standardThreadPool"/>
+  <socketAcceptor id="socketAcceptor" logicExecutor="#standardThreadPool"/>
+
+<!--  missing  atou=users,dc=example,dc=com
+  <changePasswordServer ipPort="60464">
+    <directoryService>#directoryService</directoryService>
+    <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
+  </changePasswordServer>
+-->
+<!--  missing atou=users,dc=example,dc=com
+  <kdcServer ipPort="60088">
+    <directoryService>#directoryService</directoryService>
+    <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
+  </kdcServer>
+-->
+  <ntpServer ipPort="60123">
+    <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
+  </ntpServer>
+<!--  missing atou=users,dc=example,dc=com
+  <dnsServer ipPort="8053">
+    <directoryService>#directoryService</directoryService>
+    <datagramAcceptor>#datagramAcceptor</datagramAcceptor>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
+  </dnsServer>
+-->
 
-    <!-- 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>
+  <ldapService id="ldapsService"
+              enabled="true"
+              ipPort="10636"
+              enableLdaps="true">
+    <directoryService>#directoryService</directoryService>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
+  </ldapService>
+
+
+  <ldapService id="ldapService"
+              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 FQDN of this SASL host, validated during SASL negotiation.     -->
-    <property name="saslHost" value="ldap.example.com" />
+    <directoryService>#directoryService</directoryService>
+    <socketAcceptor>#socketAcceptor</socketAcceptor>
 
-    <!-- The Kerberos principal name for this LDAP service, used by GSSAPI. -->
-    <property name="saslPrincipal" value="ldap/ldap.example.com@EXAMPLE.COM" />
+    <!-- The list of supported authentication mechanisms.                   -->
+    <saslMechanismHandlers>
+      <simpleMechanismHandler mech-name="SIMPLE"/>
+      <cramMd5MechanismHandler mech-name="CRAM-MD5" />
+      <digestMd5MechanismHandler mech-name="DIGEST-MD5" />
+      <gssapiMechanismHandler mech-name="GSSAPI" />
+      <ntlmMechanismHandler mech-name="NTLM" ntlmProviderFqcn="com.foo.Bar"/>
+      <ntlmMechanismHandler mech-name="GSS-SPNEGO" ntlmProviderFqcn="com.foo.Bar"/>
+    </saslMechanismHandlers>
 
     <!-- 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>
+    <saslQop>
+      <s:value>auth</s:value>
+      <s:value>auth-int</s:value>
+      <s:value>auth-conf</s:value>
+    </saslQop>
 
     <!-- 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" />
+    <saslRealms>
+      <s:value>example.com</s:value>
+      <s:value>apache.org</s:value>
+    </saslRealms>
 
     <!-- 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" />
-
-    <!-- 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                   -->
-
-    <property name="ldifDirectory">
-      <value>ldif</value>
-    </property>
-
-    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
-    <!-- order specified.                                                   -->
-    <!--
-    <property name="ldifFilters">
-      <list>
-        <bean class="com.example.MyEntryFilter"/>
-      </list>
-    </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 -->
-    <!-- together simply set this value to <= 0.  Make sure you turn on     -->
-    <!-- synchOnWrite for all partitions if you do choose to do this or else-->
-    <!-- writes may never persist to disk.                                  -->
-    <property name="synchPeriodMillis" value="15000" />
-
-    <!-- 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" />
-
-    <!--
-       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
-
-            '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
-
-       to a more human readabile form like:
-
-            'uid=admin,ou=system'
-
-       then set this property to true.
-    -->
-    <property name="denormalizeOpAttrsEnabled" value="false" />
-
-    <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" />
-
-    <property name="partitionConfigurations">
-      <set>
-        <ref bean="examplePartitionConfiguration"/>
-      </set>
-    </property>
-
-    <property name="interceptorConfigurations">
-      <list>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="normalizationService" />
-          <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="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="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="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="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="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="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="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="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="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="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="interceptorClassName"
-            value="org.apache.directory.server.core.trigger.TriggerService" />
-        </bean>
-
-        <!-- Uncomment to enable replication service
-        <bean class="org.apache.directory.mitosis.configuration.MutableReplicationInterceptorConfiguration">
-          <property name="name" value="replicationService" />
-          <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>
-        -->
-      </list>
-    </property>
-  </bean>
-
-  <!-- use the following partitionConfiguration to override defaults for  -->
-  <!-- the system partition                                               -->
-  <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <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
-      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.
-    -->
-    <property name="synchOnWrite" value="true" />
-    <property name="indexedAttributes">
-      <set>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <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" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="uid" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="objectClass" />
-          <property name="cacheSize" value="100" />
-        </bean>
-      </set>
-    </property>
-    <property name="contextEntry">
-      <value>
-        objectClass: top
-        objectClass: organizationalUnit
-        objectClass: extensibleObject
-        ou: system
-      </value>
-    </property>
-  </bean>
-
-
-  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <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                         -->
-    <property name="optimizerEnabled" value="true" />
-
-    <!--
-      Synchronization on writes does not wait for synch operations
-      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.
-    -->
-    <property name="synchOnWrite" value="true" />
-    <property name="indexedAttributes">
-      <set>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <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="dc" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="ou" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="krb5PrincipalName" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="uid" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="objectClass" />
-          <property name="cacheSize" value="100" />
-        </bean>
-      </set>
-    </property>
-    <property name="contextEntry">
-      <value>
-        objectClass: top
-        objectClass: domain
-        objectClass: extensibleObject
-        dc: example
-      </value>
-    </property>
-  </bean>
-
-  <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <property name="customEditors">
-      <map>
-        <entry key="javax.naming.directory.Attributes">
-          <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </entry>
-      </map>
-   </property>
-  </bean>
-</beans>
+    <extendedOperationHandlers>
+      <startTlsHandler/>
+      <gracefulShutdownHandler/>
+      <launchDiagnosticUiHandler/>
+      <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.-->
+      <!--storedProcedureExtendedOperationHandler/-->
+    </extendedOperationHandlers>
+  </ldapService>
+
+
+  <apacheDS id="apacheDS"
+            synchPeriodMillis="15000"
+            allowAnonymousAccess="false">
+
+    <directoryService>#directoryService</directoryService>
+    <ldapService>#ldapService</ldapService>
+    <ldapsService>#ldapsService</ldapsService>
+  </apacheDS>
+
+  <!-- another bean I didn't convert -->
+  <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+    <spring:property name="customEditors">
+      <spring:map>
+        <spring:entry key="javax.naming.directory.Attributes">
+          <spring:bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
+        </spring:entry>
+      </spring:map>
+    </spring:property>
+  </spring:bean>
+</spring:beans>

Modified: geronimo/plugins/directory/branches/1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/branches/1.0/pom.xml?rev=708950&r1=708949&r2=708950&view=diff
==============================================================================
--- geronimo/plugins/directory/branches/1.0/pom.xml (original)
+++ geronimo/plugins/directory/branches/1.0/pom.xml Wed Oct 29 10:45:56 2008
@@ -18,7 +18,8 @@
 
 <!-- $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>
 
@@ -46,7 +47,6 @@
     </scm>
 
     <properties>
-        <siteId>plugins/directory</siteId>
         <!--
         NOTE: Project version, to be used instead of ${pom.version} since that
               value magically changes when using SNAPSHOT versions.
@@ -58,19 +58,13 @@
         <version>1.0.1-SNAPSHOT</version>
 
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1.3</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
+        <apachedsVersion>1.5.4</apachedsVersion>
+        <apachedsSharedVersion>0.9.12</apachedsSharedVersion>
     </properties>
 
-    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
-    <distributionManagement>
-        <site>
-            <id>geronimo-website</id>
-            <url>${staging.siteURL}/${siteId}/${version}</url>
-        </site>
-    </distributionManagement>
-    
     <dependencyManagement>
         <dependencies>
             <!-- NOTA BENE: use the org.apache.geronimo.javamail/geronimo-javamail_1.4_mail uber jar
@@ -113,13 +107,13 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>1.4.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jcl</artifactId>
                 <version>1.4.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
@@ -137,8 +131,8 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-spring</artifactId>
+              <groupId>org.apache.xbean</groupId>
+              <artifactId>xbean-spring</artifactId>
                 <version>3.1</version>
             </dependency>
 
@@ -168,120 +162,138 @@
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-server-jndi</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-bootstrap-extract</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-bootstrap-partition</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.apache.directory.server</groupId>-->
+                <!--<artifactId>apacheds-btree-base</artifactId>-->
+                <!--<version>${apachedsVersion}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
-                <artifactId>apacheds-btree-base</artifactId>
-                <version>1.5.1</version>
+                <artifactId>apacheds-core</artifactId>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
-                <artifactId>apacheds-core</artifactId>
-                <version>1.5.1</version>
+                <artifactId>apacheds-core-entry</artifactId>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-core-shared</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-jdbm-store</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-schema-bootstrap</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-schema-registries</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-utils</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-kerberos-shared</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-changepw</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
-            <!--<dependency>-->
-            <!--<groupId>org.apache.directory.server</groupId>-->
-            <!--<artifactId>apacheds-protocol-dhcp</artifactId>-->
-            <!--<version>1.5.1</version>-->
-            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-dns</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-kerberos</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-ldap</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-ntp</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-protocol-shared</artifactId>
-                <version>1.5.1</version>
+                <version>${apachedsVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-xbean-spring</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>mitosis</artifactId>
+                <version>${apachedsVersion}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.directory.daemon</groupId>
                 <artifactId>daemon-bootstrappers</artifactId>
-                <version>1.1.1</version>
+                <version>1.1.2-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-ldap</artifactId>
-                <version>0.9.7</version>
+                <version>${apachedsSharedVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-ldap-constants</artifactId>
-                <version>0.9.7</version>
+                <version>${apachedsSharedVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-asn1</artifactId>
-                <version>0.9.7</version>
+                <version>${apachedsSharedVersion}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.directory.shared</groupId>
                 <artifactId>shared-asn1-codec</artifactId>
-                <version>0.9.7</version>
+                <version>${apachedsSharedVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.directory.shared</groupId>
+                <artifactId>ldap</artifactId>
+                <version>${apachedsSharedVersion}</version>
             </dependency>
 
             <dependency>
@@ -295,23 +307,17 @@
                 <version>1.1.2</version>
             </dependency>
 
-            <dependency>
-                <groupId>backport-util-concurrent</groupId>
-                <artifactId>backport-util-concurrent</artifactId>
-                <version>3.0</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>backport-util-concurrent</groupId>-->
+                <!--<artifactId>backport-util-concurrent</artifactId>-->
+                <!--<version>3.0</version>-->
+            <!--</dependency>-->
 
             <dependency>
                 <groupId>commons-collections</groupId>
                 <artifactId>commons-collections</artifactId>
                 <version>3.2</version>
             </dependency>
-            
-            <dependency>
-                <groupId>commons-lang</groupId>
-                <artifactId>commons-lang</artifactId>
-                <version>2.3</version>
-            </dependency>
 
             <dependency>
                 <groupId>antlr</groupId>
@@ -324,8 +330,6 @@
                 <artifactId>jdbm</artifactId>
                 <version>1.0</version>
             </dependency>
-
-
             <dependency>
                 <groupId>org.apache.geronimo.framework</groupId>
                 <artifactId>geronimo-gbean-deployer</artifactId>
@@ -333,6 +337,79 @@
                 <version>${geronimoVersion}</version>
             </dependency>
 
+            <!-- apparently pulled in transitively in trunk? -->
+            <dependency>
+                <groupId>commons-daemon</groupId>
+                <artifactId>commons-daemon</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-xdbm-tools</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-xdbm-search</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>1.3.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-core-constants</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.shared</groupId>
+                <artifactId>shared-bouncycastle-reduced</artifactId>
+                <version>${apachedsSharedVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-core-avl</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>jug</groupId>
+                <artifactId>jug-asl</artifactId>
+                <version>2.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-schema-extras</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-xdbm-base</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-core-jndi</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-jdbm</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.directory.server</groupId>
+                <artifactId>apacheds-core-cursor</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 
@@ -348,6 +425,24 @@
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.0-alpha-4</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>groovy-maven-plugin</artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
                     <configuration>
                         <archive>
@@ -386,7 +481,7 @@
                     </execution>
                 </executions>
             </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
@@ -452,6 +547,7 @@
             </releases>
         </repository>
 
+<!--
         <repository>
             <id>java.net</id>
             <url>http://download.java.net/maven/1/</url>
@@ -463,6 +559,7 @@
                 <enabled>true</enabled>
             </releases>
         </repository>
+-->
 
     </repositories>