diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-01 21:02:46 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-01 21:02:46 +0000 |
| commit | 858b4a97a1c243ddcb12f414747ac93eb05d71af (patch) | |
| tree | f51f2a55972db8d899327712af2f13d60b131230 /java/sca/distribution/features/core | |
| parent | 67f055ab655347ad98c3896a17cfadc8ec0a15b3 (diff) | |
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.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@691059 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/features/core')
3 files changed, 12 insertions, 8 deletions
diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index 24cf8437cb..0625057123 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -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> diff --git a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml index 5906d0e343..0737573fc0 100644 --- a/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml +++ b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -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> diff --git a/java/sca/distribution/features/core/src/main/components/src-modules.xml b/java/sca/distribution/features/core/src/main/components/src-modules.xml index 1d1faab9dc..725285aa9e 100644 --- a/java/sca/distribution/features/core/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/core/src/main/components/src-modules.xml @@ -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> |