You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/01 23:02:47 UTC
svn commit: r691059 - in /tuscany/java/sca/distribution/features: all/
all/src/main/components/ core/ core/src/main/components/ ejava/
ejava/src/main/components/ manager/ manager/src/main/components/ process/
process/src/main/components/ web20/ web20/s...
Author: jsdelfino
Date: Mon Sep 1 14:02:46 2008
New Revision: 691059
URL: http://svn.apache.org/viewvc?rev=691059&view=rev
Log:
Added node-launcher-equinox to the distro to test integration with OSGi/Equinox. Added SDO databinding to the Web Service distribution as I had missed it before.
Modified:
tuscany/java/sca/distribution/features/all/pom.xml
tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/core/pom.xml
tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/ejava/pom.xml
tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/manager/pom.xml
tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/process/pom.xml
tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/web20/pom.xml
tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml
tuscany/java/sca/distribution/features/webservice/pom.xml
tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
Modified: tuscany/java/sca/distribution/features/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/all/pom.xml (original)
+++ tuscany/java/sca/distribution/features/all/pom.xml Mon Sep 1 14:02:46 2008
@@ -149,6 +149,7 @@
<module>../../../modules/databinding-json</module>
<module>../../../modules/databinding-saxon</module>
<module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/domain-manager</module>
@@ -186,7 +187,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
Modified: tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -63,6 +63,7 @@
<include>databinding-json/**/*</include>
<include>databinding-saxon/**/*</include>
<include>databinding-sdo/**/*</include>
+ <include>databinding-sdo-axiom/**/*</include>
<include>definitions/**/*</include>
<include>definitions-xml/**/*</include>
<include>distribution-core/**/*</include>
@@ -106,7 +107,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>node-manager/**/*</include>
<include>policy/**/*</include>
Modified: tuscany/java/sca/distribution/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/pom.xml (original)
+++ tuscany/java/sca/distribution/features/core/pom.xml Mon Sep 1 14:02:46 2008
@@ -170,7 +170,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-osgi</artifactId>
+ <artifactId>tuscany-node-launcher-equinox</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
@@ -307,7 +307,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
Modified: tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml (original)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml Mon Sep 1 14:02:46 2008
@@ -66,7 +66,7 @@
<exclude>org.apache.tuscany.sca:tuscany-node-api</exclude>
<exclude>org.apache.tuscany.sca:tuscany-node-impl</exclude>
<exclude>org.apache.tuscany.sca:tuscany-node-launcher</exclude>
- <exclude>org.apache.tuscany.sca:tuscany-node-launcher-osgi</exclude>
+ <exclude>org.apache.tuscany.sca:tuscany-node-launcher-equinox</exclude>
<exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
<exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
@@ -91,13 +91,17 @@
<exclude>javax.xml.bind:jaxb-api</exclude>
<exclude>javax.xml.stream:stax-api</exclude>
<exclude>javax.xml.ws:jaxws-api</exclude>
- <exclude>org.apache.felix:org.apache.felix.framework</exclude>
- <exclude>org.apache.felix:org.osgi.compendium</exclude>
- <exclude>org.apache.felix:org.osgi.core</exclude>
- <exclude>org.apache.felix:org.osgi.foundation</exclude>
<exclude>org.apache.geronimo.specs:geronimo-commonj_1.1_spec</exclude>
<exclude>org.apache.ws.commons.schema:XmlSchema</exclude>
<exclude>org.codehaus.woodstox:wstx-asl</exclude>
+ <exclude>org.eclipse.core:contenttype</exclude>
+ <exclude>org.eclipse.core:jobs</exclude>
+ <exclude>org.eclipse.core:runtime</exclude>
+ <exclude>org.eclipse.equinox:app</exclude>
+ <exclude>org.eclipse.equinox:common</exclude>
+ <exclude>org.eclipse.equinox:preferences</exclude>
+ <exclude>org.eclipse.equinox:registry</exclude>
+ <exclude>org.eclipse:osgi</exclude>
<exclude>wsdl4j:wsdl4j</exclude>
<exclude>org.apache.tuscany.sca:*</exclude>
</excludes>
Modified: tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -63,7 +63,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
Modified: tuscany/java/sca/distribution/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/pom.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/pom.xml Mon Sep 1 14:02:46 2008
@@ -160,7 +160,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
Modified: tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -74,7 +74,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
Modified: tuscany/java/sca/distribution/features/manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/pom.xml (original)
+++ tuscany/java/sca/distribution/features/manager/pom.xml Mon Sep 1 14:02:46 2008
@@ -234,7 +234,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
Modified: tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -81,7 +81,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>node-manager/**/*</include>
<include>policy/**/*</include>
Modified: tuscany/java/sca/distribution/features/process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/pom.xml (original)
+++ tuscany/java/sca/distribution/features/process/pom.xml Mon Sep 1 14:02:46 2008
@@ -136,7 +136,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
Modified: tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -69,7 +69,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
Modified: tuscany/java/sca/distribution/features/web20/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/pom.xml (original)
+++ tuscany/java/sca/distribution/features/web20/pom.xml Mon Sep 1 14:02:46 2008
@@ -189,7 +189,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
Modified: tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -79,7 +79,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>
Modified: tuscany/java/sca/distribution/features/webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/pom.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/pom.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/pom.xml Mon Sep 1 14:02:46 2008
@@ -89,6 +89,16 @@
<artifactId>tuscany-databinding-jaxb-axiom</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
<!-- Hosts -->
<dependency>
@@ -172,6 +182,8 @@
<module>../../../modules/databinding-axiom</module>
<module>../../../modules/databinding-jaxb</module>
<module>../../../modules/databinding-jaxb-axiom</module>
+ <module>../../../modules/databinding-sdo</module>
+ <module>../../../modules/databinding-sdo-axiom</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/endpoint</module>
@@ -196,7 +208,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
- <module>../../../modules/node-launcher-osgi</module>
+ <module>../../../modules/node-launcher-equinox</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
Modified: tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008
@@ -47,6 +47,8 @@
<include>databinding-axiom/**/*</include>
<include>databinding-jaxb/**/*</include>
<include>databinding-jaxb-axiom/**/*</include>
+ <include>databinding-sdo/**/*</include>
+ <include>databinding-sdo-axiom/**/*</include>
<include>definitions/**/*</include>
<include>definitions-xml/**/*</include>
<include>distribution-core/**/*</include>
@@ -72,7 +74,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
- <include>node-launcher-osgi/**/*</include>
+ <include>node-launcher-equinox/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>