You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/06/07 20:49:31 UTC
svn commit: r412485 - in /geronimo/trunk: ./ modules/
modules/client-builder/src/resources/
modules/client-builder/src/resources/META-INF/
modules/directory/src/resources/ modules/directory/src/resources/META-INF/
modules/jetty-builder/ modules/jetty/ ...
Author: djencks
Date: Wed Jun 7 11:49:30 2006
New Revision: 412485
URL: http://svn.apache.org/viewvc?rev=412485&view=rev
Log:
GERONIMO-2071 bug fix. fix some dependencies and add missing src geronimo-dependency.xml files
Added:
geronimo/trunk/modules/client-builder/src/resources/
geronimo/trunk/modules/client-builder/src/resources/META-INF/
geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml (with props)
geronimo/trunk/modules/directory/src/resources/
geronimo/trunk/modules/directory/src/resources/META-INF/
geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml (with props)
geronimo/trunk/modules/jetty/src/resources/
geronimo/trunk/modules/jetty/src/resources/META-INF/
geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml (with props)
geronimo/trunk/modules/webservices/src/resources/
geronimo/trunk/modules/webservices/src/resources/META-INF/
geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml (with props)
Modified:
geronimo/trunk/modules/jetty-builder/pom.xml
geronimo/trunk/modules/jetty/pom.xml
geronimo/trunk/modules/pom.xml
geronimo/trunk/pom.xml
Added: geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml?rev=412485&view=auto
==============================================================================
--- geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml Wed Jun 7 11:49:30 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+ <dep:artifactId>geronimo-client</dep:artifactId>
+ </dep:dependency>
+</dep:service>
\ No newline at end of file
Propchange: geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/trunk/modules/client-builder/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml?rev=412485&view=auto
==============================================================================
--- geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml Wed Jun 7 11:49:30 2006
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:dependency>
+ <dep:groupId>directory</dep:groupId>
+ <dep:artifactId>apacheds-core</dep:artifactId>
+ <dep:version>0.9.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory</dep:groupId>
+ <dep:artifactId>apacheds-shared</dep:artifactId>
+ <dep:version>0.9.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-asn1</dep:groupId>
+ <dep:artifactId>asn1-codec</dep:artifactId>
+ <dep:version>0.3.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-shared</dep:groupId>
+ <dep:artifactId>apache-ldapber-provider</dep:artifactId>
+ <dep:version>0.9.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-asn1</dep:groupId>
+ <dep:artifactId>asn1-ber</dep:artifactId>
+ <dep:version>0.3.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-asn1</dep:groupId>
+ <dep:artifactId>asn1-der</dep:artifactId>
+ <dep:version>0.3.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>jdbm</dep:groupId>
+ <dep:artifactId>jdbm</dep:artifactId>
+ <dep:version>0.20-dev</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>regexp</dep:groupId>
+ <dep:artifactId>regexp</dep:artifactId>
+ <dep:version>1.3</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>oro</dep:groupId>
+ <dep:artifactId>oro</dep:artifactId>
+ <dep:version>2.0.8</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>commons-lang</dep:groupId>
+ <dep:artifactId>commons-lang</dep:artifactId>
+ <dep:version>2.0</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>commons-collections</dep:groupId>
+ <dep:artifactId>commons-collections</dep:artifactId>
+ <dep:version>3.1</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>commons-io</dep:groupId>
+ <dep:artifactId>commons-io</dep:artifactId>
+ <dep:version>1.1</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>commons-primitives</dep:groupId>
+ <dep:artifactId>commons-primitives</dep:artifactId>
+ <dep:version>20041207.202534</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-shared</dep:groupId>
+ <dep:artifactId>ldap-common</dep:artifactId>
+ <dep:version>0.9.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-shared</dep:groupId>
+ <dep:artifactId>kerberos-common</dep:artifactId>
+ <dep:version>0.5</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-network</dep:groupId>
+ <dep:artifactId>mina</dep:artifactId>
+ <dep:version>0.7.3</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-protocols</dep:groupId>
+ <dep:artifactId>kerberos-protocol</dep:artifactId>
+ <dep:version>0.5</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>directory-protocols</dep:groupId>
+ <dep:artifactId>ldap-protocol</dep:artifactId>
+ <dep:version>0.9.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>antlr</dep:groupId>
+ <dep:artifactId>antlr</dep:artifactId>
+ <dep:version>2.7.2</dep:version>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>org.slf4j</dep:groupId>
+ <dep:artifactId>slf4j-simple</dep:artifactId>
+ <dep:version>1.0-beta7</dep:version>
+ </dep:dependency>
+</dep:service>
\ No newline at end of file
Propchange: geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/trunk/modules/directory/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=412485&r1=412484&r2=412485&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Wed Jun 7 11:49:30 2006
@@ -72,7 +72,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=412485&r1=412484&r2=412485&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Wed Jun 7 11:49:30 2006
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>jetty</groupId>
@@ -74,28 +74,10 @@
<version>${jettyVersion}</version>
</dependency>
<!-- these are included in geronimo-dependency.xml -->
+ <!-- servlet-spec was not needed in M1 -->
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${wadiSpringVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>activecluster</groupId>
- <artifactId>activecluster</artifactId>
- <version>${wadiActiveClusterVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>wadi</groupId>
- <artifactId>wadi-core</artifactId>
- <version>${wadiVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>wadi</groupId>
- <artifactId>wadi-jetty5</artifactId>
- <version>${wadiVersion}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
<dependency>
@@ -127,6 +109,7 @@
<artifactId>commons-collections</artifactId>
<version>${commonsCollectionsVersion}</version>
</dependency>
+
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
Added: geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml?rev=412485&view=auto
==============================================================================
--- geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml Wed Jun 7 11:49:30 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:dependency>
+ <dep:groupId>jetty</dep:groupId>
+ <dep:artifactId>org.mortbay.jetty</dep:artifactId>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>tomcat</dep:groupId>
+ <dep:artifactId>jasper-compiler</dep:artifactId>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>tomcat</dep:groupId>
+ <dep:artifactId>jasper-compiler-jdt</dep:artifactId>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>tomcat</dep:groupId>
+ <dep:artifactId>jasper-runtime</dep:artifactId>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>commons-el</dep:groupId>
+ <dep:artifactId>commons-el</dep:artifactId>
+ </dep:dependency>
+</dep:service>
\ No newline at end of file
Propchange: geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/trunk/modules/jetty/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=412485&r1=412484&r2=412485&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Wed Jun 7 11:49:30 2006
@@ -62,9 +62,9 @@
<module>j2ee</module>
<module>j2ee-builder</module>
<module>j2ee-schema</module>
-<!-- <module>jetty</module>
+ <module>jetty</module>
<module>jetty-builder</module>
- <module>javamail-transport</module> -->
+<!-- <module>javamail-transport</module> -->
<module>jmx-remoting</module>
<module>kernel</module>
<module>management</module>
Added: geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml?rev=412485&view=auto
==============================================================================
--- geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml (added)
+++ geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml Wed Jun 7 11:49:30 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.specs</dep:groupId>
+ <dep:artifactId>geronimo-jaxr_1.0_spec</dep:artifactId>
+ </dep:dependency>
+</dep:service>
\ No newline at end of file
Propchange: geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/trunk/modules/webservices/src/resources/META-INF/geronimo-dependency.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=412485&r1=412484&r2=412485&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Jun 7 11:49:30 2006
@@ -213,7 +213,7 @@
<xfireVersion>20050202</xfireVersion>
<xmlApisVersion>1.0.b2</xmlApisVersion>
<xmlbeansVersion>2.0.0</xmlbeansVersion>
- <xmlbeansMavenPluginVersion>2.0</xmlbeansMavenPluginVersion>
+ <xmlbeansMavenPluginVersion>2.0.1-SNAPSHOT</xmlbeansMavenPluginVersion>
<xmlParserApisVersion>2.2.1</xmlParserApisVersion>
<xmlpullVersion>1.1.3.4d_b4_min</xmlpullVersion>
<xmlResolverVersion>1.1</xmlResolverVersion>
@@ -627,6 +627,12 @@
<version>${geronimoVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jetty</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>