geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r708716 - in /geronimo/plugins/directory/trunk: ./ directory/ directory/src/main/history/ directory/src/main/resources/META-INF/ geronimo-directory-server/ geronimo-directory/ geronimo-directory/src/main/java/org/apache/geronimo/directory/ ...
Date Tue, 28 Oct 2008 23:12:15 GMT
Author: djencks
Date: Tue Oct 28 16:12:14 2008
New Revision: 708716

URL: http://svn.apache.org/viewvc?rev=708716&view=rev
Log:
update trunk directory plugin to apacheds 1.5.4

Added:
    geronimo/plugins/directory/trunk/directory/src/main/history/
    geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml   (with props)
Removed:
    geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/geronimo-plugin.xml
Modified:
    geronimo/plugins/directory/trunk/directory/pom.xml
    geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/server.xml
    geronimo/plugins/directory/trunk/geronimo-directory-server/pom.xml
    geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
    geronimo/plugins/directory/trunk/geronimo-directory/src/main/java/org/apache/geronimo/directory/DirectoryGBean.java
    geronimo/plugins/directory/trunk/geronimo-directory/src/test/resources/server.xml
    geronimo/plugins/directory/trunk/pom.xml

Modified: geronimo/plugins/directory/trunk/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/directory/pom.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/directory/pom.xml (original)
+++ geronimo/plugins/directory/trunk/directory/pom.xml Tue Oct 28 16:12:14 2008
@@ -58,174 +58,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-server-jndi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-bootstrap-extract</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-bootstrap-partition</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-btree-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-core-entry</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-core-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-jdbm-store</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-schema-bootstrap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-schema-registries</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-utils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-kerberos-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-changepw</artifactId>
-        </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.apache.directory.server</groupId>-->
-        <!--<artifactId>apacheds-protocol-dhcp</artifactId>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-dns</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-kerberos</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-ldap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-ntp</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-protocol-shared</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-xbean-spring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>mitosis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.directory.daemon</groupId>
-            <artifactId>daemon-bootstrappers</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-ldap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-ldap-constants</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-asn1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-asn1-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-ssl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-        </dependency>
-        <!--<dependency>-->
-        <!--<groupId>backport-util-concurrent</groupId>-->
-        <!--<artifactId>backport-util-concurrent</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jdbm</groupId>
-            <artifactId>jdbm</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -237,18 +69,6 @@
     </dependencies>
 
     <build>
-        <!--
-
-        NOTE: Don't add to extentions here, or JCL will freak out about multipule versions.
-
-        <extensions>
-            <extension>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${version}</version>
-            </extension>
-        </extensions>
-        -->
 
         <plugins>
             <plugin>
@@ -267,11 +87,6 @@
                     <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>

Added: geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml?rev=708716&view=auto
==============================================================================
--- geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml (added)
+++ geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml Tue Oct 28 16:12:14 2008
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>directory</artifactId>
+        <version>1.1-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>opensymphony</groupId>
+        <artifactId>quartz</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-asn1-codec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-daemon</groupId>
+        <artifactId>commons-daemon</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-jdbm-store</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-schema-registries</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-entry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap-constants</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-utils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-xdbm-tools</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-xbean-spring</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-server-jndi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-protocol-shared</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-xdbm-search</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-constants</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-bouncycastle-reduced</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>tanukisoft</groupId>
+        <artifactId>wrapper</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-bootstrap-partition</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-io</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-protocol-ldap</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-shared</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-avl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-filter-ssl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>jug</groupId>
+        <artifactId>jug-asl</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>mitosis</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-schema-extras</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-protocol-ntp</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-xdbm-base</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-jndi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-schema-bootstrap</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-kerberos-shared</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-jdbm</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.mina</groupId>
+        <artifactId>mina-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-asn1</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-bootstrap-extract</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.daemon</groupId>
+        <artifactId>daemon-bootstrappers</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>geronimo-directory</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-ldap</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-cursor</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <type>jar</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/directory/trunk/directory/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/server.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/server.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/server.xml (original)
+++ geronimo/plugins/directory/trunk/directory/src/main/resources/META-INF/server.xml Tue Oct 28 16:12:14 2008
@@ -1,7 +1,28 @@
 <?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.
+-->
+
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" xmlns="http://apacheds.org/config/1.0">
+<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"
@@ -24,15 +45,6 @@
           <jdbmIndex attributeId="uid" cacheSize="100"/>
           <jdbmIndex attributeId="objectClass" cacheSize="100"/>
         </indexedAttributes>
-        <contextEntry>#systemContextEntry</contextEntry>
-        <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
-            objectClass: top
-            objectClass: organizationalUnit
-            objectClass: extensibleObject
-            ou: system
-          </value>
-        </contextEntry -->
       </jdbmPartition>
     </systemPartition>
 
@@ -56,22 +68,12 @@
           <jdbmIndex attributeId="uid" cacheSize="100"/>
           <jdbmIndex attributeId="objectClass" cacheSize="100"/>
         </indexedAttributes>
-        <contextEntry>#exampleContextEntry</contextEntry>
-        <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
-            objectClass: top
-            objectClass: domain
-            objectClass: extensibleObject
-            dc: example
-          </value>
-        </contextEntry -->
       </jdbmPartition>
     </partitions>
 
     <interceptors>
       <normalizationInterceptor/>
       <authenticationInterceptor/>
-      <referralInterceptor/>
       <aciAuthorizationInterceptor/>
       <defaultAuthorizationInterceptor/>
       <exceptionInterceptor/>
@@ -132,16 +134,16 @@
   </dnsServer>
 -->
 
-<!-- no certificate  -->
-  <ldapServer id="ldapsServer"
-          enabled="false"
-              ipPort="60636"
+  <ldapService id="ldapsService"
+              enabled="true"
+              ipPort="10636"
               enableLdaps="true">
     <directoryService>#directoryService</directoryService>
     <socketAcceptor>#socketAcceptor</socketAcceptor>
-  </ldapServer>
+  </ldapService>
+
 
-  <ldapServer id="ldapServer"
+  <ldapService id="ldapService"
               ipPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
@@ -152,36 +154,39 @@
 
     <directoryService>#directoryService</directoryService>
     <socketAcceptor>#socketAcceptor</socketAcceptor>
+
     <!-- The list of supported authentication mechanisms.                   -->
-    <supportedMechanisms>
-      <value xmlns="http://www.springframework.org/schema/beans">SIMPLE</value>
-      <value xmlns="http://www.springframework.org/schema/beans">CRAM-MD5</value>
-      <value xmlns="http://www.springframework.org/schema/beans">DIGEST-MD5</value>
-      <!--<value xmlns="http://www.springframework.org/schema/beans">GSSAPI</value>-->
-    </supportedMechanisms>
+    <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.  -->
     <saslQop>
-      <value xmlns="http://www.springframework.org/schema/beans">auth</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-int</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-conf</value>
+      <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. -->
     <saslRealms>
-      <value xmlns="http://www.springframework.org/schema/beans">example.com</value>
-      <value xmlns="http://www.springframework.org/schema/beans">apache.org</value>
+      <s:value>example.com</s:value>
+      <s:value>apache.org</s:value>
     </saslRealms>
 
     <!-- the collection of extended operation handlers to install           -->
     <extendedOperationHandlers>
-      <!--startTlsHandler/-->
+      <startTlsHandler/>
       <gracefulShutdownHandler/>
       <launchDiagnosticUiHandler/>
       <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.-->
       <!--storedProcedureExtendedOperationHandler/-->
     </extendedOperationHandlers>
-  </ldapServer>
+  </ldapService>
 
 
   <apacheDS id="apacheDS"
@@ -189,44 +194,10 @@
             allowAnonymousAccess="false">
 
     <directoryService>#directoryService</directoryService>
-    <ldapServer>#ldapServer</ldapServer>
-    <ldapsServer>#ldapsServer</ldapsServer>
+    <ldapService>#ldapService</ldapService>
+    <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
 
-  <spring:bean id="systemContextEntry"
-	class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
-    <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
-    <spring:property name="arguments">
-      <spring:list>
-        <spring:value xmlns="http://www.springframework.org/schema/beans">
-          objectClass: top
-          objectClass: organizationalUnit
-          objectClass: extensibleObject
-          ou: system
-        </spring:value>
-        <spring:value>ou=system</spring:value>
-      </spring:list>
-    </spring:property>
-  </spring:bean>
-
-  <spring:bean id="exampleContextEntry"
-	class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
-    <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
-    <spring:property name="arguments">
-      <spring:list>
-        <spring:value xmlns="http://www.springframework.org/schema/beans">
-          objectClass: top
-          objectClass: domain
-          objectClass: extensibleObject
-          dc: example
-        </spring:value>
-        <spring:value>dc=example,dc=com</spring:value>
-      </spring:list>
-    </spring:property>
-  </spring:bean>
-
   <!-- another bean I didn't convert -->
   <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
     <spring:property name="customEditors">

Modified: geronimo/plugins/directory/trunk/geronimo-directory-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory-server/pom.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory-server/pom.xml (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory-server/pom.xml Tue Oct 28 16:12:14 2008
@@ -1,100 +1,95 @@
-<?xml version="1.0"?><project>
-  <parent>
-    <artifactId>directory-parent</artifactId>
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.geronimo.assemblies</groupId>
-  <artifactId>geronimo-directory-server</artifactId>
-  <packaging>application-assembly</packaging>
+<?xml version="1.0"?>
+<project>
+    <parent>
+        <artifactId>directory-parent</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.assemblies</groupId>
+    <artifactId>geronimo-directory-server</artifactId>
+    <packaging>application-assembly</packaging>
     <name>Sample Geronimo server running Apache Directory</name>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.geronimo.buildsupport</groupId>
-          <artifactId>car-maven-plugin</artifactId>
-          <version>${geronimoVersion}</version>
-          <extensions>true</extensions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.geronimo.genesis.plugins</groupId>
-          <artifactId>tools-maven-plugin</artifactId>
-          <version>1.3</version>
-          <extensions>true</extensions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-        <artifactId>tools-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.geronimo.buildsupport</groupId>
-        <artifactId>car-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>install</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>install-modules</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>archive</id>
-            <phase>package</phase>
-            <goals>
-              <goal>archive</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <servers>
-            <serverInstance>
-              <name>default</name>
-              <configFile>var/config/config.xml</configFile>
-              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-            </serverInstance>
-              <serverInstance>
-                  <name>client</name>
-                  <attributeManagerFrom>default</attributeManagerFrom>
-                  <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
-              </serverInstance>
-              <serverInstance>
-                  <name>jsr88</name>
-                  <configFile>var/config/jsr88-configurer-config.xml</configFile>
-                  <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                  <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                  <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-              </serverInstance>
-          </servers>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.geronimo.assemblies</groupId>
-      <artifactId>geronimo-boilerplate-minimal</artifactId>
-      <version>${geronimoVersion}</version>
-    </dependency>
-      <!-- allow installation of additional modules -->
-    <dependency>
-      <groupId>org.apache.geronimo.framework</groupId>
-      <artifactId>plugin</artifactId>
-      <version>${geronimoVersion}</version>
-      <type>car</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.plugins</groupId>
-      <artifactId>directory</artifactId>
-      <version>${version}</version>
-      <type>car</type>
-    </dependency>
-  </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>${geronimoVersion}</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                    <artifactId>tools-maven-plugin</artifactId>
+                    <version>1.3</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>install-modules</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>archive</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>directory</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file

Modified: geronimo/plugins/directory/trunk/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory/pom.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory/pom.xml (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory/pom.xml Tue Oct 28 16:12:14 2008
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-bootstrap-partition</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -73,13 +72,11 @@
         <dependency>
             <groupId>org.apache.directory.server</groupId>
             <artifactId>apacheds-protocol-ntp</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.directory.shared</groupId>
             <artifactId>shared-ldap</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/plugins/directory/trunk/geronimo-directory/src/main/java/org/apache/geronimo/directory/DirectoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory/src/main/java/org/apache/geronimo/directory/DirectoryGBean.java?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory/src/main/java/org/apache/geronimo/directory/DirectoryGBean.java (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory/src/main/java/org/apache/geronimo/directory/DirectoryGBean.java Tue Oct 28 16:12:14 2008
@@ -51,7 +51,7 @@
 
     public DirectoryGBean(String workingDir,
                           String configFile,
-                          ServerInfo serverInfo) throws NamingException, MalformedURLException, IOException {
+                          ServerInfo serverInfo) throws Exception {
 
         if (serverInfo == null) {
             throw new IllegalArgumentException("Must have a ServerInfo value in initParams.");

Modified: geronimo/plugins/directory/trunk/geronimo-directory/src/test/resources/server.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/geronimo-directory/src/test/resources/server.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/geronimo-directory/src/test/resources/server.xml (original)
+++ geronimo/plugins/directory/trunk/geronimo-directory/src/test/resources/server.xml Tue Oct 28 16:12:14 2008
@@ -1,7 +1,28 @@
 <?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.
+-->
+
 
-<spring:beans xmlns:spring="http://xbean.apache.org/schemas/spring/1.0" xmlns="http://apacheds.org/config/1.0">
+<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"
@@ -24,15 +45,6 @@
           <jdbmIndex attributeId="uid" cacheSize="100"/>
           <jdbmIndex attributeId="objectClass" cacheSize="100"/>
         </indexedAttributes>
-        <contextEntry>#systemContextEntry</contextEntry>
-        <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
-            objectClass: top
-            objectClass: organizationalUnit
-            objectClass: extensibleObject
-            ou: system
-          </value>
-        </contextEntry -->
       </jdbmPartition>
     </systemPartition>
 
@@ -56,22 +68,12 @@
           <jdbmIndex attributeId="uid" cacheSize="100"/>
           <jdbmIndex attributeId="objectClass" cacheSize="100"/>
         </indexedAttributes>
-        <contextEntry>#exampleContextEntry</contextEntry>
-        <!-- contextEntry>
-          <value xmlns="http://www.springframework.org/schema/beans">
-            objectClass: top
-            objectClass: domain
-            objectClass: extensibleObject
-            dc: example
-          </value>
-        </contextEntry -->
       </jdbmPartition>
     </partitions>
 
     <interceptors>
       <normalizationInterceptor/>
       <authenticationInterceptor/>
-      <referralInterceptor/>
       <aciAuthorizationInterceptor/>
       <defaultAuthorizationInterceptor/>
       <exceptionInterceptor/>
@@ -132,16 +134,16 @@
   </dnsServer>
 -->
 
-<!-- no certificate  -->
-  <ldapServer id="ldapsServer"
-          enabled="false"
-              ipPort="60636"
+  <ldapService id="ldapsService"
+              enabled="true"
+              ipPort="10636"
               enableLdaps="true">
     <directoryService>#directoryService</directoryService>
     <socketAcceptor>#socketAcceptor</socketAcceptor>
-  </ldapServer>
+  </ldapService>
+
 
-  <ldapServer id="ldapServer"
+  <ldapService id="ldapService"
               ipPort="10389"
               allowAnonymousAccess="false"
               saslHost="ldap.example.com"
@@ -152,36 +154,39 @@
 
     <directoryService>#directoryService</directoryService>
     <socketAcceptor>#socketAcceptor</socketAcceptor>
+
     <!-- The list of supported authentication mechanisms.                   -->
-    <supportedMechanisms>
-      <value xmlns="http://www.springframework.org/schema/beans">SIMPLE</value>
-      <value xmlns="http://www.springframework.org/schema/beans">CRAM-MD5</value>
-      <value xmlns="http://www.springframework.org/schema/beans">DIGEST-MD5</value>
-      <!--<value xmlns="http://www.springframework.org/schema/beans">GSSAPI</value>-->
-    </supportedMechanisms>
+    <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.  -->
     <saslQop>
-      <value xmlns="http://www.springframework.org/schema/beans">auth</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-int</value>
-      <value xmlns="http://www.springframework.org/schema/beans">auth-conf</value>
+      <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. -->
     <saslRealms>
-      <value xmlns="http://www.springframework.org/schema/beans">example.com</value>
-      <value xmlns="http://www.springframework.org/schema/beans">apache.org</value>
+      <s:value>example.com</s:value>
+      <s:value>apache.org</s:value>
     </saslRealms>
 
     <!-- the collection of extended operation handlers to install           -->
     <extendedOperationHandlers>
-      <!--startTlsHandler/-->
+      <startTlsHandler/>
       <gracefulShutdownHandler/>
       <launchDiagnosticUiHandler/>
       <!-- The Stored Procedure Extended Operation is not stable yet and it may cause security risks.-->
       <!--storedProcedureExtendedOperationHandler/-->
     </extendedOperationHandlers>
-  </ldapServer>
+  </ldapService>
 
 
   <apacheDS id="apacheDS"
@@ -189,44 +194,10 @@
             allowAnonymousAccess="false">
 
     <directoryService>#directoryService</directoryService>
-    <ldapServer>#ldapServer</ldapServer>
-    <ldapsServer>#ldapsServer</ldapsServer>
+    <ldapService>#ldapService</ldapService>
+    <ldapsService>#ldapsService</ldapsService>
   </apacheDS>
 
-  <spring:bean id="systemContextEntry"
-	class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
-    <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
-    <spring:property name="arguments">
-      <spring:list>
-        <spring:value xmlns="http://www.springframework.org/schema/beans">
-          objectClass: top
-          objectClass: organizationalUnit
-          objectClass: extensibleObject
-          ou: system
-        </spring:value>
-        <spring:value>ou=system</spring:value>
-      </spring:list>
-    </spring:property>
-  </spring:bean>
-
-  <spring:bean id="exampleContextEntry"
-	class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <spring:property name="targetObject"><spring:ref local='directoryService'/></spring:property>
-    <spring:property name="targetMethod"><spring:value>newEntry</spring:value></spring:property>
-    <spring:property name="arguments">
-      <spring:list>
-        <spring:value xmlns="http://www.springframework.org/schema/beans">
-          objectClass: top
-          objectClass: domain
-          objectClass: extensibleObject
-          dc: example
-        </spring:value>
-        <spring:value>dc=example,dc=com</spring:value>
-      </spring:list>
-    </spring:property>
-  </spring:bean>
-
   <!-- another bean I didn't convert -->
   <spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
     <spring:property name="customEditors">

Modified: geronimo/plugins/directory/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/directory/trunk/pom.xml?rev=708716&r1=708715&r2=708716&view=diff
==============================================================================
--- geronimo/plugins/directory/trunk/pom.xml (original)
+++ geronimo/plugins/directory/trunk/pom.xml Tue Oct 28 16:12:14 2008
@@ -62,8 +62,8 @@
         <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
 
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-        <apachedsVersion>1.5.2-SNAPSHOT</apachedsVersion>
-        <apachedsSharedVersion>0.9.9-SNAPSHOT</apachedsSharedVersion>
+        <apachedsVersion>1.5.4</apachedsVersion>
+        <apachedsSharedVersion>0.9.12</apachedsSharedVersion>
     </properties>
 
     <dependencyManagement>
@@ -175,11 +175,11 @@
                 <artifactId>apacheds-bootstrap-partition</artifactId>
                 <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>${apachedsVersion}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>org.apache.directory.server</groupId>
                 <artifactId>apacheds-core</artifactId>



Mime
View raw message