Return-Path: 
 <scm-return-21084-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 20387 invoked from network); 7 Aug 2007 20:34:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Aug 2007 20:34:31 -0000
Received: (qmail 76598 invoked by uid 500); 7 Aug 2007 20:34:29 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 76561 invoked by uid 500); 7 Aug 2007 20:34:29 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 76550 invoked by uid 99); 7 Aug 2007 20:34:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2007 13:34:29 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Aug 2007 20:34:23 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 327C91A981D; Tue,  7 Aug 2007 13:34:07 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r563647 - in /geronimo/server/trunk: configs/directory/
 configs/pom.xml modules/geronimo-directory/ modules/pom.xml pom.xml
Date: Tue, 07 Aug 2007 20:34:07 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070807203407.327C91A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Tue Aug  7 13:34:06 2007
New Revision: 563647

URL: http://svn.apache.org/viewvc?view=rev&rev=563647
Log:
GERONIMO-3340 remove directory from server since it's a plugin now

Removed:
    geronimo/server/trunk/configs/directory/
    geronimo/server/trunk/modules/geronimo-directory/
Modified:
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=563647&r1=563646&r2=563647
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Aug  7 13:34:06 2007
@@ -120,7 +120,6 @@
         <module>client-transaction</module>
         <module>connector-deployer</module>
         <module>clustering</module>
-        <!--<module>directory</module>-->
         <module>xmlbeans</module>
         <module>geronimo-gbean-deployer</module>
         <module>hot-deployer</module>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=563647&r1=563646&r2=563647
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Aug  7 13:34:06 2007
@@ -64,7 +64,6 @@
         <module>geronimo-deploy-tool</module>
         <module>geronimo-deployment</module>
         <module>geronimo-derby</module>
-        <!--<module>geronimo-directory</module>-->
         <module>geronimo-hot-deploy</module>
         <module>geronimo-interceptor</module>
         <module>geronimo-j2ee</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=563647&r1=563646&r2=563647
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Aug  7 13:34:06 2007
@@ -440,21 +440,21 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jcl</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>1.3.0</version>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.4.0</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>
@@ -829,88 +829,6 @@
             </dependency>
 
             <dependency>
-                <groupId>directory</groupId>
-                <artifactId>apacheds-core</artifactId>
-                <version>0.9.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory</groupId>
-                <artifactId>apacheds-shared</artifactId>
-                <version>0.9.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-asn1</groupId>
-                <artifactId>asn1-codec</artifactId>
-                <version>0.3.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-asn1</groupId>
-                <artifactId>asn1-ber</artifactId>
-                <version>0.3.2</version>
-                <exclusions>
-                    <!--
-                    NOTE: Exclude commons-test, no needed for compile, not deployed into any m2 repo.
-                          Where are the sources for this artifact?
-                    -->
-                    <exclusion>
-                        <groupId>commons-test</groupId>
-                        <artifactId>commons-test</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-asn1</groupId>
-                <artifactId>asn1-der</artifactId>
-                <version>0.3.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-shared</groupId>
-                <artifactId>apache-ldapber-provider</artifactId>
-                <version>0.9.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-shared</groupId>
-                <artifactId>ldap-common</artifactId>
-                <version>0.9.2</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-shared</groupId>
-                <artifactId>kerberos-common</artifactId>
-                <version>0.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-network</groupId>
-                <artifactId>mina</artifactId>
-                <version>0.7.3</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-protocols</groupId>
-                <artifactId>kerberos-protocol</artifactId>
-                <version>0.5</version>
-            </dependency>
-
-            <dependency>
-                <groupId>directory-protocols</groupId>
-                <artifactId>ldap-protocol</artifactId>
-                <version>0.9.2</version>
-            </dependency>
-
-            <!--<dependency>-->
-                <!--<groupId>org.apache.tomcat</groupId>-->
-                <!--<artifactId>annotations-api</artifactId>-->
-                <!--<version>${tomcatVersion}</version>-->
-            <!--</dependency>-->
-
-            <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper</artifactId>
                 <version>6.0.13-G543818</version>
@@ -1274,20 +1192,25 @@
 
             <dependency>
                 <groupId>org.springframework</groupId>
+                <artifactId>spring</artifactId>
+                <version>2.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.5</version>
             </dependency>
 
             <!--JSF 1.2 JARs from Apache MyFaces -->