From 14763b4f204450039ef985ff72de47c5a569a9a6 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 22 Mar 2006 15:27:50 +0000 Subject: [PATCH] Reved up to the latest version of the geronimo spec jars git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387873 13f79535-47bb-0310-9956-ffa450edef68 --- activecluster/project.xml | 31 +++++++++++++++----------- activemq-optional/project.xml | 7 +++--- activemq-ra/project.xml | 6 +++--- activemq-systest/project.xml | 4 ++-- activemq-web/project.xml | 4 ++-- assembly/project.xml | 8 +++---- etc/project.properties | 16 +++++++------- etc/project.xml | 31 +++++++------------------- jmeter/project.xml | 4 ++-- pom.xml | 36 +++++++++++++++---------------- systest/itests/client/project.xml | 4 ++-- systest/itests/ejb/project.xml | 4 ++-- systest/jboss-test/project.xml | 6 +++--- systest/usecases/project.xml | 4 ++-- 14 files changed, 77 insertions(+), 88 deletions(-) diff --git a/activecluster/project.xml b/activecluster/project.xml index bc9f745864..3d21b6f6ab 100644 --- a/activecluster/project.xml +++ b/activecluster/project.xml @@ -64,19 +64,24 @@ http://jakarta.apache.org/commons/logging/ - - geronimo-spec+jms - 1.1-rc4 - - - geronimo-spec+jta - 1.0.1B-rc4 - - - geronimo-spec+j2ee-management - 1.0-rc4 - - + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.0 + + + + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec + 1.0 + + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.0_spec + 1.0 + + ${pom.groupId} diff --git a/activemq-optional/project.xml b/activemq-optional/project.xml index 43a3ce2c1e..3548a2a4bc 100755 --- a/activemq-optional/project.xml +++ b/activemq-optional/project.xml @@ -60,12 +60,11 @@ - geronimo-spec - geronimo-spec-j2ee-connector + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec ${geronimo_spec_j2ee_connector_version} - - + springframework spring diff --git a/activemq-ra/project.xml b/activemq-ra/project.xml index 5a89ecf2d8..182737e9af 100755 --- a/activemq-ra/project.xml +++ b/activemq-ra/project.xml @@ -40,15 +40,15 @@ - geronimo-spec - geronimo-spec-j2ee-connector + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec ${geronimo_spec_j2ee_connector_version} false true - + ${pom.groupId} activemq-core diff --git a/activemq-systest/project.xml b/activemq-systest/project.xml index 94060c1f9a..08a992cb8a 100755 --- a/activemq-systest/project.xml +++ b/activemq-systest/project.xml @@ -45,8 +45,8 @@ - geronimo-spec - geronimo-spec-j2ee-connector + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec ${geronimo_spec_j2ee_connector_version} false diff --git a/activemq-web/project.xml b/activemq-web/project.xml index 427b02fcda..0ac3de0a6e 100755 --- a/activemq-web/project.xml +++ b/activemq-web/project.xml @@ -95,8 +95,8 @@ - geronimo-spec - geronimo-spec-jsp + org.apache.geronimo.specs + geronimo-jsp_2.0_spec ${geronimo_spec_jsp_version} false diff --git a/assembly/project.xml b/assembly/project.xml index eaadc9b3a3..a02025200b 100755 --- a/assembly/project.xml +++ b/assembly/project.xml @@ -261,8 +261,8 @@ - geronimo-spec - geronimo-spec-jsp + org.apache.geronimo.specs + geronimo-jsp_2.0_spec ${geronimo_spec_jsp_version} false @@ -271,8 +271,8 @@ - geronimo-spec - geronimo-spec-j2ee-connector + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec ${geronimo_spec_j2ee_connector_version} true diff --git a/etc/project.properties b/etc/project.properties index 0474e6d7a7..af8daf4254 100755 --- a/etc/project.properties +++ b/etc/project.properties @@ -73,7 +73,7 @@ maven.repo.apache.scp.executable=scp 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 @@ commons_jelly_tags_velocity_version=SNAPSHOT velocity_version=1.4-rc1 -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 activesoap_version=1.0-SNAPSHOT diff --git a/etc/project.xml b/etc/project.xml index eb556a9c2a..db5518bd9b 100755 --- a/etc/project.xml +++ b/etc/project.xml @@ -328,24 +328,9 @@ - - - - geronimo-spec - geronimo-spec-jms + org.apache.geronimo.specs + geronimo-jms_1.1_spec ${geronimo_spec_jms_version} true @@ -357,8 +342,8 @@ - geronimo-spec - geronimo-spec-jta + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec ${geronimo_spec_jta_version} false @@ -368,8 +353,8 @@ - geronimo-spec - geronimo-spec-j2ee-management + org.apache.geronimo.specs + geronimo-j2ee-management_1.0_spec ${geronimo_spec_j2ee_management_version} true @@ -380,8 +365,8 @@ - geronimo-spec - geronimo-spec-j2ee-jacc + org.apache.geronimo.specs + geronimo-j2ee-jacc_1.0_spec ${geronimo_spec_j2ee_jacc_version} false diff --git a/jmeter/project.xml b/jmeter/project.xml index acddf96ed0..161386c80c 100755 --- a/jmeter/project.xml +++ b/jmeter/project.xml @@ -312,8 +312,8 @@ - geronimo-spec - geronimo-spec-j2ee + org.apache.geronimo.specs + geronimo-j2ee_1.4_spec ${geronimo_spec_j2ee_version} true diff --git a/pom.xml b/pom.xml index b81c662fa6..f416ff6e1d 100755 --- a/pom.xml +++ b/pom.xml @@ -129,39 +129,39 @@ - geronimo-spec - geronimo-spec-jms - 1.1-rc4 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.0 - geronimo-spec - geronimo-spec-jta - 1.0.1B-rc4 + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec + 1.0 - geronimo-spec - geronimo-spec-j2ee-management - 1.0-rc4 + org.apache.geronimo.specs + geronimo-j2ee-management_1.0_spec + 1.0 - geronimo-spec - geronimo-spec-j2ee-jacc - 1.0-rc4 + org.apache.geronimo.specs + geronimo-j2ee-jacc_1.0_spec + 1.0 - geronimo-spec - geronimo-spec-j2ee-connector - 1.5-rc4 + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec + 1.0 - geronimo-spec - geronimo-spec-jsp - 2.0-rc4 + org.apache.geronimo.specs + geronimo-jsp_2.0_spec + 1.0 diff --git a/systest/itests/client/project.xml b/systest/itests/client/project.xml index bb2d73b2e6..891480b91c 100755 --- a/systest/itests/client/project.xml +++ b/systest/itests/client/project.xml @@ -34,8 +34,8 @@ - geronimo-spec - geronimo-spec-ejb + org.apache.geronimo.specs + geronimo-ejb_2.1_spec ${geronimo_spec_ejb_version} diff --git a/systest/itests/ejb/project.xml b/systest/itests/ejb/project.xml index 6c698ad097..3e4fb627fb 100755 --- a/systest/itests/ejb/project.xml +++ b/systest/itests/ejb/project.xml @@ -21,8 +21,8 @@ - geronimo-spec - geronimo-spec-ejb + org.apache.geronimo.specs + geronimo-ejb_2.1_spec ${geronimo_spec_ejb_version} false diff --git a/systest/jboss-test/project.xml b/systest/jboss-test/project.xml index 008fbb2493..bcbadc602b 100644 --- a/systest/jboss-test/project.xml +++ b/systest/jboss-test/project.xml @@ -29,9 +29,9 @@ - geronimo-spec - geronimo-spec-j2ee - 1.4-rc4 + org.apache.geronimo.specs + geronimo-j2ee_1.4_spec + 1.0 http://geronimo.apache.org/ diff --git a/systest/usecases/project.xml b/systest/usecases/project.xml index ed6cf025b3..ef3a2ab5f5 100644 --- a/systest/usecases/project.xml +++ b/systest/usecases/project.xml @@ -15,8 +15,8 @@ - geronimo-spec - geronimo-spec-servlet + org.apache.geronimo.specs + geronimo-servlet_2.4_spec ${geronimo_spec_servlet_version} false