You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/10/30 09:29:48 UTC
svn commit: r831226 [5/5] - in /tuscany/branches/sca-java-2.0-M4: ./
archetypes/ archetypes/contribution-jar/
archetypes/contribution-jar/src/main/resources/archetype-resources/
archetypes/contribution-zip-discriptor/ archetypes/contribution-zip/ arche...
Modified: tuscany/branches/sca-java-2.0-M4/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/pom.xml Fri Oct 30 08:29:42 2009
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Apache Tuscany SCA Implementation Project (2.x)</name>
<url>http://tuscany.apache.org</url>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/tuscany/java/sca</connection>
@@ -378,7 +378,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-osgi-junit</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<executions>
<execution>
<id>osgi-test</id>
@@ -406,7 +406,7 @@
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-dependency-lister</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<executions>
<execution>
<phase>process-resources</phase>
Modified: tuscany/branches/sca-java-2.0-M4/samples/binding-ws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/binding-ws-calculator/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/binding-ws-calculator/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/binding-ws-calculator/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-binding-ws-calculator</artifactId>
@@ -40,28 +40,28 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-api</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-core</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-webservice</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-ejava</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/calculator-equinox/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator-equinox</artifactId>
@@ -39,33 +39,33 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extensibility-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/calculator-osgi/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator-osgi</artifactId>
@@ -39,14 +39,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-core</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
@@ -92,7 +92,14 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-reference/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator-rmi-reference</artifactId>
@@ -32,25 +32,25 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/calculator-rmi-service/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator-rmi-service</artifactId>
@@ -32,24 +32,24 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/calculator/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/calculator/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/calculator/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-calculator</artifactId>
@@ -32,20 +32,20 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator-operations/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,21 +33,21 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-ejava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -116,7 +116,14 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/dosgi-calculator/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,27 +33,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-ejava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-webservice</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -121,7 +121,21 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>2.0-M4-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator-operations/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,21 +33,21 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-ejava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -116,7 +116,14 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/dosgi-dynamic-calculator/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,27 +33,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-ejava</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-webservice</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl-osgi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -121,7 +121,14 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/helloworld-bpel/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/helloworld-bpel/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-helloworld-bpel</artifactId>
@@ -32,20 +32,20 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-bpel-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -89,7 +89,14 @@
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-osgi-junit-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>osgi-test</id>
Modified: tuscany/branches/sca-java-2.0-M4/samples/implementation-java-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/implementation-java-calculator/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/implementation-java-calculator/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/implementation-java-calculator/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>sample-implementation-java-calculator</artifactId>
@@ -40,14 +40,14 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-api</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-feature-core</artifactId>
<type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-samples</artifactId>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-bpel/pom.xml Fri Oct 30 08:29:42 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -33,7 +33,7 @@
<name>Apache Tuscany SCA Sample Helloworld BPEL</name>
<properties>
- <tuscany.version>2.0-SNAPSHOT</tuscany.version>
+ <tuscany.version>2.0-M4-SNAPSHOT</tuscany.version>
<jetty.version>6.1.19</jetty.version>
</properties>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jms/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,21 +35,21 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-js-client/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-client</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsf/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,21 +35,21 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-myfaces</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-jsp/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-rest/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>helloworld-rest</artifactId>
@@ -48,21 +48,21 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -70,14 +70,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rest-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-servlet/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-stripes/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -36,12 +36,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-stripes</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<!-- Stripes Framework dependencies -->
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld-wicket/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -36,12 +36,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-wicket</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml?rev=831226&r1=831221&r2=831226&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml (original)
+++ tuscany/branches/sca-java-2.0-M4/samples/webapps/helloworld/pom.xml Fri Oct 30 08:29:42 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-M4-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>