You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/10 03:42:57 UTC
svn commit: r355700 - in /geronimo/trunk: ./ assemblies/j2ee-installer/
assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/
configs/daytrader-jetty/ configs/daytrader-tomcat/ configs/jmxdebug-jetty/
configs/jmxdebug-tomcat/ configs/ldap-realm/...
Author: ammulder
Date: Fri Dec 9 18:42:54 2005
New Revision: 355700
URL: http://svn.apache.org/viewcvs?rev=355700&view=rev
Log:
Updates to to work with new spec versions
Modified:
geronimo/trunk/assemblies/j2ee-installer/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
geronimo/trunk/configs/daytrader-jetty/project.xml
geronimo/trunk/configs/daytrader-tomcat/project.xml
geronimo/trunk/configs/jmxdebug-jetty/project.xml
geronimo/trunk/configs/jmxdebug-tomcat/project.xml
geronimo/trunk/configs/ldap-realm/project.xml
geronimo/trunk/configs/remote-deploy-jetty/project.xml
geronimo/trunk/configs/remote-deploy-tomcat/project.xml
geronimo/trunk/maven.xml
Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Fri Dec 9 18:42:54 2005
@@ -660,7 +660,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc1.0_spec</artifactId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<version>${geronimo_spec_j2ee_jacc_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
@@ -684,7 +684,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr1.0_spec</artifactId>
+ <artifactId>geronimo-jaxr_1.0_spec</artifactId>
<version>${geronimo_spec_jaxr_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
@@ -1183,12 +1183,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc1.0_spec</artifactId>
- <version>${geronimo_spec_j2ee_jacc_version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
<version>${geronimo_spec_activation_version}</version>
</dependency>
@@ -1229,11 +1223,6 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-client-builder</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-clustering</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Dec 9 18:42:54 2005
@@ -643,7 +643,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr1.0_spec</artifactId>
+ <artifactId>geronimo-jaxr_1.0_spec</artifactId>
<version>${geronimo_spec_jaxr_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Dec 9 18:42:54 2005
@@ -644,7 +644,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr1.0_spec</artifactId>
+ <artifactId>geronimo-jaxr_1.0_spec</artifactId>
<version>${geronimo_spec_jaxr_version}</version>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
Modified: geronimo/trunk/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.xml (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.xml Fri Dec 9 18:42:54 2005
@@ -92,8 +92,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
Modified: geronimo/trunk/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.xml Fri Dec 9 18:42:54 2005
@@ -94,8 +94,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
Modified: geronimo/trunk/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-jetty/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-jetty/project.xml Fri Dec 9 18:42:54 2005
@@ -73,8 +73,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
Modified: geronimo/trunk/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-tomcat/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/trunk/configs/jmxdebug-tomcat/project.xml Fri Dec 9 18:42:54 2005
@@ -73,8 +73,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
Modified: geronimo/trunk/configs/ldap-realm/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-realm/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/project.xml (original)
+++ geronimo/trunk/configs/ldap-realm/project.xml Fri Dec 9 18:42:54 2005
@@ -175,8 +175,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
Modified: geronimo/trunk/configs/remote-deploy-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.xml Fri Dec 9 18:42:54 2005
@@ -57,8 +57,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>${geronimo_spec_servlet_version}</version>
</dependency>
<dependency>
@@ -89,8 +89,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
<dependency>
Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.xml Fri Dec 9 18:42:54 2005
@@ -57,8 +57,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-servlet</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>${geronimo_spec_servlet_version}</version>
</dependency>
<dependency>
@@ -89,8 +89,8 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimo_spec_j2ee_version}</version>
</dependency>
<dependency>
Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/maven.xml?rev=355700&r1=355699&r2=355700&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Fri Dec 9 18:42:54 2005
@@ -40,7 +40,7 @@
<goal name="new1">
<maven:reactor basedir="${basedir}" includes="modules/*/project.xml,plugins/*/project.xml"
- excludes="modules/assembly/project.xml" goals="multiproject:install-callback" banner="geronimo and geronimo-plugins" ignoreFailures="false" />
+ excludes="modules/interop/project.xml" goals="multiproject:install-callback" banner="geronimo and geronimo-plugins" ignoreFailures="false" />
</goal>
<goal name="new2">