Author: chirino
Date: Wed Mar 22 07:27:50 2006
New Revision: 387873
URL: http://svn.apache.org/viewcvs?rev=387873&view=rev
Log:
Reved up to the latest version of the geronimo spec jars
Modified:
incubator/activemq/trunk/activecluster/project.xml
incubator/activemq/trunk/activemq-optional/project.xml
incubator/activemq/trunk/activemq-ra/project.xml
incubator/activemq/trunk/activemq-systest/project.xml
incubator/activemq/trunk/activemq-web/project.xml
incubator/activemq/trunk/assembly/project.xml
incubator/activemq/trunk/etc/project.properties
incubator/activemq/trunk/etc/project.xml
incubator/activemq/trunk/jmeter/project.xml
incubator/activemq/trunk/pom.xml
incubator/activemq/trunk/systest/itests/client/project.xml
incubator/activemq/trunk/systest/itests/ejb/project.xml
incubator/activemq/trunk/systest/jboss-test/project.xml
incubator/activemq/trunk/systest/usecases/project.xml
Modified: incubator/activemq/trunk/activecluster/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/project.xml (original)
+++ incubator/activemq/trunk/activecluster/project.xml Wed Mar 22 07:27:50 2006
@@ -64,19 +64,24 @@
<url>http://jakarta.apache.org/commons/logging/</url>
</dependency>
- <dependency>
- <id>geronimo-spec+jms</id>
- <version>1.1-rc4</version>
- </dependency>
- <dependency>
- <id>geronimo-spec+jta</id>
- <version>1.0.1B-rc4</version>
- </dependency>
- <dependency>
- <id>geronimo-spec+j2ee-management</id>
- <version>1.0-rc4</version>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
<!-- default JMS provider used for implementation -->
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: incubator/activemq/trunk/activemq-optional/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/project.xml (original)
+++ incubator/activemq/trunk/activemq-optional/project.xml Wed Mar 22 07:27:50
2006
@@ -60,12 +60,11 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
</dependency>
-
-
+
<dependency>
<id>springframework</id>
<artifactId>spring</artifactId>
Modified: incubator/activemq/trunk/activemq-ra/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/project.xml (original)
+++ incubator/activemq/trunk/activemq-ra/project.xml Wed Mar 22 07:27:50 2006
@@ -40,15 +40,15 @@
<dependencies>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
<properties>
<rar.bundle>false</rar.bundle>
<lib>true</lib>
</properties>
</dependency>
-
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>activemq-core</artifactId>
Modified: incubator/activemq/trunk/activemq-systest/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/project.xml (original)
+++ incubator/activemq/trunk/activemq-systest/project.xml Wed Mar 22 07:27:50
2006
@@ -45,8 +45,8 @@
<dependencies>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
<properties>
<rar.bundle>false</rar.bundle>
Modified: incubator/activemq/trunk/activemq-web/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/project.xml (original)
+++ incubator/activemq/trunk/activemq-web/project.xml Wed Mar 22 07:27:50 2006
@@ -95,8 +95,8 @@
<!-- optional used for in-web container testing -->
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jsp</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
<version>${geronimo_spec_jsp_version}</version>
<properties>
<war.bundle>false</war.bundle>
Modified: incubator/activemq/trunk/assembly/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.xml (original)
+++ incubator/activemq/trunk/assembly/project.xml Wed Mar 22 07:27:50 2006
@@ -261,8 +261,8 @@
<!-- to create a web server to test out the web stuff -->
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jsp</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
<version>${geronimo_spec_jsp_version}</version>
<properties>
<war.bundle>false</war.bundle>
@@ -271,8 +271,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimo_spec_j2ee_connector_version}</version>
<properties>
<optional>true</optional>
Modified: incubator/activemq/trunk/etc/project.properties
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/etc/project.properties?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/etc/project.properties (original)
+++ incubator/activemq/trunk/etc/project.properties Wed Mar 22 07:27:50 2006
@@ -73,7 +73,7 @@
<!-- used by all modules -->
ant_version=1.6
-geronimo_spec_j2ee_version=1.4-rc4
+geronimo_spec_j2ee_version=1.0
concurrent_version=1.3.4
commons_logging_version=1.0.3
log4j_version=1.2.12
@@ -177,13 +177,13 @@
velocity_version=1.4-rc1
<!-- j2ee API fragment jars, used for WARs -->
-geronimo_spec_jms_version=1.1-rc4
-geronimo_spec_jta_version=1.0.1B-rc4
-geronimo_spec_j2ee_management_version=1.0-rc4
-geronimo_spec_j2ee_jacc_version=1.0-rc4
-geronimo_spec_ejb_version=2.1-rc4
-geronimo_spec_j2ee_connector_version=1.5-rc4
-geronimo_spec_jsp_version=2.0-rc4
+geronimo_spec_jms_version=1.0
+geronimo_spec_jta_version=1.0
+geronimo_spec_j2ee_management_version=1.0
+geronimo_spec_j2ee_jacc_version=1.0
+geronimo_spec_ejb_version=1.0
+geronimo_spec_j2ee_connector_version=1.0
+geronimo_spec_jsp_version=1.0
<!-- used by activemq-ws -->
activesoap_version=1.0-SNAPSHOT
Modified: incubator/activemq/trunk/etc/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/etc/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/etc/project.xml (original)
+++ incubator/activemq/trunk/etc/project.xml Wed Mar 22 07:27:50 2006
@@ -328,24 +328,9 @@
</properties>
</dependency>
- <!--
-
- lets switch to using the specific J2EE jars we need
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>${geronimo_spec_version}</version>
- <properties>
- <rar.bundle>false</rar.bundle>
- <lib>true</lib>
- </properties>
- </dependency>
- -->
-
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo_spec_jms_version}</version>
<properties>
<activemq.module>true</activemq.module>
@@ -357,8 +342,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<version>${geronimo_spec_jta_version}</version>
<properties>
<lib>false</lib>
@@ -368,8 +353,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
<version>${geronimo_spec_j2ee_management_version}</version>
<properties>
<activemq.module>true</activemq.module>
@@ -380,8 +365,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<version>${geronimo_spec_j2ee_jacc_version}</version>
<properties>
<rar.bundle>false</rar.bundle>
Modified: incubator/activemq/trunk/jmeter/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/project.xml (original)
+++ incubator/activemq/trunk/jmeter/project.xml Wed Mar 22 07:27:50 2006
@@ -312,8 +312,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>
<properties>
<jmeter.module>true</jmeter.module>
Modified: incubator/activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Wed Mar 22 07:27:50 2006
@@ -129,39 +129,39 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>1.1-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- <version>1.0.1B-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-management</artifactId>
- <version>1.0-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- <version>1.0-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-connector</artifactId>
- <version>1.5-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jsp</artifactId>
- <version>2.0-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <version>1.0</version>
</dependency>
Modified: incubator/activemq/trunk/systest/itests/client/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/systest/itests/client/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/systest/itests/client/project.xml (original)
+++ incubator/activemq/trunk/systest/itests/client/project.xml Wed Mar 22
07:27:50 2006
@@ -34,8 +34,8 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-ejb</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
<version>${geronimo_spec_ejb_version}</version>
</dependency>
<dependency>
Modified: incubator/activemq/trunk/systest/itests/ejb/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/systest/itests/ejb/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/systest/itests/ejb/project.xml (original)
+++ incubator/activemq/trunk/systest/itests/ejb/project.xml Wed Mar 22 07:27:50
2006
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-ejb</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
<version>${geronimo_spec_ejb_version}</version>
<properties>
<rar.bundle>false</rar.bundle>
Modified: incubator/activemq/trunk/systest/jboss-test/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/systest/jboss-test/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/systest/jboss-test/project.xml (original)
+++ incubator/activemq/trunk/systest/jboss-test/project.xml Wed Mar 22 07:27:50
2006
@@ -29,9 +29,9 @@
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>1.4-rc4</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <version>1.0</version>
<url>http://geronimo.apache.org/</url>
</dependency>
Modified: incubator/activemq/trunk/systest/usecases/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/systest/usecases/project.xml?rev=387873&r1=387872&r2=387873&view=diff
==============================================================================
--- incubator/activemq/trunk/systest/usecases/project.xml (original)
+++ incubator/activemq/trunk/systest/usecases/project.xml Wed Mar 22 07:27:50
2006
@@ -15,8 +15,8 @@
<dependencies>
<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>
<properties>
<war.bundle>false</war.bundle>
