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 2010/11/10 16:36:31 UTC
svn commit: r1033523 - in /tuscany/sca-java-2.x/trunk: features/web20/
modules/binding-rest-runtime/ modules/contribution-osgi/
modules/extensibility-equinox/ modules/implementation-osgi/
modules/interface-java-jaxrs/ modules/node-impl-osgi/ modules/no...
Author: antelder
Date: Wed Nov 10 15:36:30 2010
New Revision: 1033523
URL: http://svn.apache.org/viewvc?rev=1033523&view=rev
Log:
Update more things for base + extensions approach
Modified:
tuscany/sca-java-2.x/trunk/features/web20/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
tuscany/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml
tuscany/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
Modified: tuscany/sca-java-2.x/trunk/features/web20/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/features/web20/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/features/web20/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/features/web20/pom.xml Wed Nov 10 15:36:30 2010
@@ -87,6 +87,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml Wed Nov 10 15:36:30 2010
@@ -34,42 +34,49 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rest</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-data-api</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-common-http</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core-spi</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -82,6 +89,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/contribution-osgi/pom.xml Wed Nov 10 15:36:30 2010
@@ -31,41 +31,19 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution</artifactId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <type>pom</type>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<version>3.5.0-v20090520</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.6</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/extensibility-equinox/pom.xml Wed Nov 10 15:36:30 2010
@@ -30,8 +30,10 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extensibility</artifactId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <type>pom</type>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-osgi/pom.xml Wed Nov 10 15:36:30 2010
@@ -43,21 +43,10 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly-xml</artifactId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <type>pom</type>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java-jaxrs/pom.xml Wed Nov 10 15:36:30 2010
@@ -37,17 +37,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-core-spi</artifactId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
@@ -58,7 +54,7 @@
<artifactId>asm</artifactId>
<version>3.1</version>
<type>jar</type>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/pom.xml Wed Nov 10 15:36:30 2010
@@ -85,7 +85,15 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
+ <scope>provided</scope>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml Wed Nov 10 15:36:30 2010
@@ -67,23 +67,19 @@
-->
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
+ <type>pom</type>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-extensibility-equinox</artifactId>
@@ -98,12 +94,6 @@
<scope>test</scope>
</dependency-->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/applications/store/pom.xml Wed Nov 10 15:36:30 2010
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -43,12 +43,54 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-web20</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-binding-atom-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-atom-js-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-web-javascript-dojo</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.6</version>
Modified: tuscany/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/extending-tuscany/implementation-sample/pom.xml Wed Nov 10 15:36:30 2010
@@ -32,38 +32,22 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-api</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-webservice</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-web20</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.19</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml Wed Nov 10 15:36:30 2010
@@ -33,9 +33,8 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime-pom</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>pom</type>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml Wed Nov 10 15:36:30 2010
@@ -34,9 +34,8 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime-pom</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>pom</type>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml Wed Nov 10 15:36:30 2010
@@ -31,20 +31,12 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime-pom</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-osgi-runtime-pom</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml?rev=1033523&r1=1033522&r2=1033523&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/running-tuscany/maven-junit/calculator-contribution/pom.xml Wed Nov 10 15:36:30 2010
@@ -31,8 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime-pom</artifactId>
- <type>pom</type>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>