You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2007/08/13 12:46:35 UTC
svn commit: r565306 - in /geronimo/sandbox/tuscany-integration:
geronimo-tuscany/ geronimo-tuscany/configs/
geronimo-tuscany/configs/src/main/resources/META-INF/
geronimo-tuscany/configs/src/plan/ geronimo-tuscany/modules/
modules/tuscany-http-geronimo/
Author: vamsic007
Date: Mon Aug 13 03:46:33 2007
New Revision: 565306
URL: http://svn.apache.org/viewvc?view=rev&rev=565306
Log:
Switch to released 2.0 version of G
Modified:
geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml
geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml
geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/pom.xml
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/pom.xml Mon Aug 13 03:46:33 2007
@@ -18,49 +18,56 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>server-security-config</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -78,14 +85,14 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<extensions>true</extensions>
<configuration>
<deploymentConfigs>
- <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/2.0-SNAPSHOT/car</deploymentConfig>
- <deploymentConfig>org.apache.geronimo.configs/j2ee-deployer/2.0-SNAPSHOT/car</deploymentConfig>
+ <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</deploymentConfig>
+ <deploymentConfig>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</deploymentConfig>
</deploymentConfigs>
- <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/2.0-SNAPSHOT/car?j2eeType=Deployer,name=Deployer</deployerName>
+ <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<planFileName>plan.xml</planFileName>
<module>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml Mon Aug 13 03:46:33 2007
@@ -28,19 +28,19 @@
<url>http://geronimo.apache.org/</url>
<author>The Apache Geronimo development community</author>
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
- <geronimo-version>2.0-SNAPSHOT</geronimo-version>
+ <geronimo-version>${geronimoVersion}</geronimo-version>
<prerequisite>
<id>org.apache.geronimo.configs/rmi-naming//car</id>
<description>
This deployer will work for tomcat binaries
</description>
</prerequisite>
- <dependency>org.apache.geronimo.configs/rmi-naming/2.0-SNAPSHOT/car</dependency>
- <dependency>org.apache.geronimo.configs/tomcat6/2.0-SNAPSHOT/car</dependency>
- <dependency>org.apache.geronimo.configs/jasper/2.0-SNAPSHOT/car</dependency>
- <dependency>org.apache.geronimo.configs/j2ee-corba-yoko/2.0-SNAPSHOT/car</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-axis2/2.0-SNAPSHOT/jar</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema/2.0-SNAPSHOT/jar</dependency>
+ <dependency>org.apache.geronimo.configs/rmi-naming/${geronimoVersion}/car</dependency>
+ <dependency>org.apache.geronimo.configs/tomcat6/${geronimoVersion}/car</dependency>
+ <dependency>org.apache.geronimo.configs/jasper/${geronimoVersion}/car</dependency>
+ <dependency>org.apache.geronimo.configs/j2ee-corba-yoko/${geronimoVersion}/car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-axis2/${geronimoVersion}/jar</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-j2ee-schema/${geronimoVersion}/jar</dependency>
<dependency>org.apache.axis2/axis2-java2wsdl/1.2/jar</dependency>
<dependency>org.apache.axis2/axis2-kernel/1.2/jar</dependency>
<dependency>org.apache.axis2/axis2-adb/1.2/jar</dependency>
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml Mon Aug 13 03:46:33 2007
@@ -11,38 +11,38 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-corba-yoko</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>jar</type>
<import>classes</import>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -585,7 +585,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/pom.xml Mon Aug 13 03:46:33 2007
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
@@ -92,22 +92,22 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
</dependencies>
<build>
@@ -147,7 +147,7 @@
<element>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>groovy-build-library</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</element>
</classpath>
<source>
Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml Mon Aug 13 03:46:33 2007
@@ -22,7 +22,7 @@
</scm>
<properties>
- <geronimoVersion>2.0-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.0</geronimoVersion>
</properties>
<modules>
<module>modules</module>
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
@@ -198,22 +198,22 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/pom.xml?view=diff&rev=565306&r1=565305&r2=565306
==============================================================================
--- geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/modules/tuscany-http-geronimo/pom.xml Mon Aug 13 03:46:33 2007
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
</dependency>
</dependencies>
<build>