geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r563662 - in /geronimo/server/branches/2.0: configs/directory/ configs/pom.xml modules/geronimo-directory/ modules/pom.xml pom.xml
Date Tue, 07 Aug 2007 21:17:20 GMT
Author: djencks
Date: Tue Aug  7 14:17:19 2007
New Revision: 563662

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

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

Modified: geronimo/server/branches/2.0/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/pom.xml?view=diff&rev=563662&r1=563661&r2=563662
==============================================================================
--- geronimo/server/branches/2.0/configs/pom.xml (original)
+++ geronimo/server/branches/2.0/configs/pom.xml Tue Aug  7 14:17:19 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/branches/2.0/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/pom.xml?view=diff&rev=563662&r1=563661&r2=563662
==============================================================================
--- geronimo/server/branches/2.0/modules/pom.xml (original)
+++ geronimo/server/branches/2.0/modules/pom.xml Tue Aug  7 14:17:19 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/branches/2.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/pom.xml?view=diff&rev=563662&r1=563661&r2=563662
==============================================================================
--- geronimo/server/branches/2.0/pom.xml (original)
+++ geronimo/server/branches/2.0/pom.xml Tue Aug  7 14:17:19 2007
@@ -444,21 +444,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>
@@ -833,88 +833,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>
@@ -1278,20 +1196,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 -->



Mime
View raw message