You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/09/18 08:27:11 UTC
svn commit: r447279 - in /incubator/tuscany/java/samples/sca:
helloworldjsonrpc/pom.xml helloworldwsOM/pom.xml
helloworldwsclientOM/pom.xml inner.composite/pom.xml spring/client/pom.xml
spring/server/pom.xml
Author: rfeng
Date: Sun Sep 17 23:27:10 2006
New Revision: 447279
URL: http://svn.apache.org/viewvc?view=rev&rev=447279
Log:
More pom fixes for samples
Modified:
incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml
incubator/tuscany/java/samples/sca/helloworldwsclientOM/pom.xml
incubator/tuscany/java/samples/sca/inner.composite/pom.xml
incubator/tuscany/java/samples/sca/spring/client/pom.xml
incubator/tuscany/java/samples/sca/spring/server/pom.xml
Modified: incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldjsonrpc/pom.xml Sun Sep 17 23:27:10 2006
@@ -17,8 +17,8 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldjsonrpc</artifactId>
@@ -30,11 +30,10 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
@@ -42,28 +41,29 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>jsonrpc</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
Modified: incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsOM/pom.xml Sun Sep 17 23:27:10 2006
@@ -20,8 +20,8 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldwsOM</artifactId>
@@ -37,11 +37,10 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
@@ -49,16 +48,17 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope> <!-- runtime is need for webapp integration to include jar -->
Modified: incubator/tuscany/java/samples/sca/helloworldwsclientOM/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldwsclientOM/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/helloworldwsclientOM/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/helloworldwsclientOM/pom.xml Sun Sep 17 23:27:10 2006
@@ -20,8 +20,8 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-helloworldwsclientOM</artifactId>
@@ -34,28 +34,28 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.bindings</groupId>
+ <groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.databinding</groupId>
+ <groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-sdo</artifactId>
- <version>${sca.version}</version>
+ <version>${pom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${sca.version}</version>
+ <version>${pom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/samples/sca/inner.composite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/inner.composite/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/inner.composite/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/inner.composite/pom.xml Sun Sep 17 23:27:10 2006
@@ -17,8 +17,8 @@
<project>
<parent>
<groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>parent</artifactId>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sample-innercomposite</artifactId>
@@ -32,7 +32,7 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/samples/sca/spring/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/spring/client/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/spring/client/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/spring/client/pom.xml Sun Sep 17 23:27:10 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.samples.sca.spring</groupId>
<artifactId>tuscany-samples-sca-spring</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-client</artifactId>
@@ -33,11 +33,10 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -46,32 +45,33 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
<!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
<!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.containers</groupId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
<artifactId>spring</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
- <version>${sca.version}</version>
+ <version>${tuscanyVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/samples/sca/spring/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/spring/server/pom.xml?view=diff&rev=447279&r1=447278&r2=447279
==============================================================================
--- incubator/tuscany/java/samples/sca/spring/server/pom.xml (original)
+++ incubator/tuscany/java/samples/sca/spring/server/pom.xml Sun Sep 17 23:27:10 2006
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany.samples.sca.spring</groupId>
<artifactId>tuscany-samples-sca-spring</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubator-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-server</artifactId>
@@ -33,11 +33,10 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r0.95</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
@@ -46,30 +45,31 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
<!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.runtime</groupId>
+ <groupId>org.apache.tuscany.sca.runtime</groupId>
<artifactId>webapp-host</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
<!-- runtime is need for webapp integration to include jar -->
</dependency>
<dependency>
- <groupId>org.apache.tuscany.containers</groupId>
+ <groupId>org.apache.tuscany.sca.services.containers</groupId>
<artifactId>spring</artifactId>
<version>${pom.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>test</artifactId>
<version>${sca.version}</version>
<scope>runtime</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org