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/10/04 09:03:39 UTC
svn commit: r581787 - in /geronimo/plugins/tuscany/trunk: pom.xml
tuscany-jetty/pom.xml
tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
tuscany-tomcat/pom.xml
tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Author: vamsic007
Date: Thu Oct 4 00:03:38 2007
New Revision: 581787
URL: http://svn.apache.org/viewvc?rev=581787&view=rev
Log:
GERONIMO-3501 The geronimo tuscany plugin cannot be started in Geronimo 2.0.1
o Thanks Raymond for providing the patch
o Switch tuscanyDasVersion to 1.0-incubating-beta1
o Added missing dependency "tuscany-definitions"
o Changed commonj/sdo-api-r2.1 to org.apache.tuscany.sdo/tuscany-sdo-api-r2.1
Modified:
geronimo/plugins/tuscany/trunk/pom.xml
geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
Modified: geronimo/plugins/tuscany/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/pom.xml?rev=581787&r1=581786&r2=581787&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/pom.xml Thu Oct 4 00:03:38 2007
@@ -59,7 +59,7 @@
<geronimoVersion>2.0.1</geronimoVersion>
<tuscanyVersion>1.0-incubating</tuscanyVersion>
<tuscanySdoVersion>1.0-incubating</tuscanySdoVersion>
- <tuscanyDasVersion>1.0-incubating-SNAPSHOT</tuscanyDasVersion>
+ <tuscanyDasVersion>1.0-incubating-beta1</tuscanyDasVersion>
</properties>
<dependencyManagement>
@@ -90,11 +90,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.1</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.3</version>
@@ -410,6 +405,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions</artifactId>
+ <version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
<version>${tuscanyVersion}</version>
</dependency>
@@ -487,6 +487,11 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
<version>${tuscanyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-api-r2.1</artifactId>
+ <version>${tuscanySdoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml?rev=581787&r1=581786&r2=581787&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/pom.xml Thu Oct 4 00:03:38 2007
@@ -66,10 +66,6 @@
<artifactId>jaxws-tools</artifactId>
</dependency>
<dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.1</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -253,6 +249,10 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
</dependency>
<dependency>
@@ -314,6 +314,10 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-api-r2.1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=581787&r1=581786&r2=581787&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-jetty/src/main/resources/META-INF/geronimo-plugin.xml Thu Oct 4 00:03:38 2007
@@ -45,7 +45,6 @@
<dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
<dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>
<dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>
- <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
<dependency>commons-codec/commons-codec/1.3/jar</dependency>
<dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
<dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>
@@ -92,6 +91,7 @@
<dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
+ <dependency>org.apache.tuscany.sca/tuscany-definitions/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
@@ -108,6 +108,7 @@
<dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-sca-api/${tuscanyVersion}/jar</dependency>
+ <dependency>org.apache.tuscany.sdo/tuscany-sdo-api-r2.1/${tuscanySdoVersion}/jar</dependency>
<dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
<dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>
Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml?rev=581787&r1=581786&r2=581787&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/pom.xml Thu Oct 4 00:03:38 2007
@@ -66,10 +66,6 @@
<artifactId>jaxws-tools</artifactId>
</dependency>
<dependency>
- <groupId>commonj</groupId>
- <artifactId>sdo-api-r2.1</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -253,6 +249,10 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extension-helper</artifactId>
</dependency>
<dependency>
@@ -314,6 +314,10 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-api-r2.1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=581787&r1=581786&r2=581787&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/tuscany/trunk/tuscany-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Thu Oct 4 00:03:38 2007
@@ -45,7 +45,6 @@
<dependency>com.sun.xml.bind/jaxb-xjc/2.0.5/jar</dependency>
<dependency>com.sun.xml.ws/jaxws-rt/2.0/jar</dependency>
<dependency>com.sun.xml.ws/jaxws-tools/2.0/jar</dependency>
- <dependency>commonj/sdo-api-r2.1/1.0-incubating-SNAPSHOT/jar</dependency>
<dependency>commons-codec/commons-codec/1.3/jar</dependency>
<dependency>commons-fileupload/commons-fileupload/1.1.1/jar</dependency>
<dependency>commons-httpclient/commons-httpclient/3.0.1/jar</dependency>
@@ -92,6 +91,7 @@
<dependency>org.apache.tuscany.sca/tuscany-core-spi/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-databinding-axiom/${tuscanyVersion}/jar</dependency>
+ <dependency>org.apache.tuscany.sca/tuscany-definitions/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-host-embedded/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
@@ -108,6 +108,7 @@
<dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-policy-xml/${tuscanyVersion}/jar</dependency>
<dependency>org.apache.tuscany.sca/tuscany-sca-api/${tuscanyVersion}/jar</dependency>
+ <dependency>org.apache.tuscany.sdo/tuscany-sdo-api-r2.1/${tuscanySdoVersion}/jar</dependency>
<dependency>org.apache.tuscany.sdo/tuscany-sdo-impl/${tuscanySdoVersion}/jar</dependency>
<dependency>org.apache.ws.commons.axiom/axiom-api/1.2.5/jar</dependency>