diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 19:20:32 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-27 19:20:32 +0000 |
commit | 5b86eacdc5fb7395c2755c1510231d7a1630b3b0 (patch) | |
tree | 1c3357fa0d566f1e2c6e2a1816802f7571b9f4ab /java | |
parent | b96e111b593a952f1e6491adead3add6738426ff (diff) |
Starting to work on including the required OSGi runtime pieces into a test distro. Added a few dependencies to the POM, that's work in progress as I'm not sure how to select Equinox as the OSGi runtime, at this point I get a mix of the two.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689576 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
10 files changed, 27 insertions, 10 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml index 94b0cb8931..554d8ab101 100644 --- a/java/sca/distribution/features/all/pom.xml +++ b/java/sca/distribution/features/all/pom.xml @@ -124,7 +124,6 @@ <module>../../../modules/distribution-process</module> <module>../../../modules/distribution-web20</module> <module>../../../modules/distribution-webservice</module> - <module>../../../modules/distribution-webservice</module> <module>../../../modules/domain-manager</module> <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> diff --git a/java/sca/distribution/features/all/src/main/components/src-modules.xml b/java/sca/distribution/features/all/src/main/components/src-modules.xml index a7e0b4ccef..d3975c5992 100644 --- a/java/sca/distribution/features/all/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/all/src/main/components/src-modules.xml @@ -71,7 +71,6 @@ <include>distribution-process/**/*</include> <include>distribution-web20/**/*</include> <include>distribution-webservice/**/*</include> - <include>distribution-webservice/**/*</include> <include>domain-manager/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> @@ -134,4 +133,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index ddb0efbbaa..c13a12e40b 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -111,6 +111,18 @@ <version>1.4-SNAPSHOT</version> </dependency> + <!-- Core Extensibility --> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-extensibility</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-extensibility-osgi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <!-- Implementation types --> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -158,6 +170,11 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-launcher-osgi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-webapp</artifactId> <version>1.4-SNAPSHOT</version> <type>war</type> @@ -238,6 +255,7 @@ <module>../../../modules/definitions-xml</module> <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> + <module>../../../modules/extensibility-osgi</module> <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> <module>../../../modules/implementation-java</module> @@ -256,6 +274,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-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 ecacf1d9f5..5906d0e343 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 @@ -47,6 +47,7 @@ <exclude>org.apache.tuscany.sca:tuscany-definitions-xml</exclude> <exclude>org.apache.tuscany.sca:tuscany-endpoint</exclude> <exclude>org.apache.tuscany.sca:tuscany-extensibility</exclude> + <exclude>org.apache.tuscany.sca:tuscany-extensibility-osgi</exclude> <exclude>org.apache.tuscany.sca:tuscany-host-embedded</exclude> <exclude>org.apache.tuscany.sca:tuscany-host-http</exclude> <exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude> @@ -65,6 +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-webapp</exclude> <exclude>org.apache.tuscany.sca:tuscany-policy</exclude> <exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude> @@ -89,6 +91,10 @@ <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> @@ -98,4 +104,3 @@ </dependencySet> </dependencySets> </component> - 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 65f356ad0f..1d1faab9dc 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 @@ -44,6 +44,7 @@ <include>definitions-xml/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> + <include>extensibility-osgi/**/*</include> <include>host-embedded/**/*</include> <include>host-http/**/*</include> <include>implementation-java/**/*</include> @@ -62,6 +63,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> + <include>node-launcher-osgi/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> @@ -84,4 +86,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml index 84ddf42be0..d99001960c 100644 --- a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml @@ -95,4 +95,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/manager/src/main/components/src-modules.xml b/java/sca/distribution/features/manager/src/main/components/src-modules.xml index 55ab42eb59..c4983de155 100644 --- a/java/sca/distribution/features/manager/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml @@ -107,4 +107,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/process/src/main/components/src-modules.xml b/java/sca/distribution/features/process/src/main/components/src-modules.xml index 8be3c5ca29..834606511c 100644 --- a/java/sca/distribution/features/process/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/process/src/main/components/src-modules.xml @@ -90,4 +90,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/web20/src/main/components/src-modules.xml b/java/sca/distribution/features/web20/src/main/components/src-modules.xml index cfef6f1c56..447675e248 100644 --- a/java/sca/distribution/features/web20/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/web20/src/main/components/src-modules.xml @@ -100,4 +100,3 @@ </fileSet> </fileSets> </component> - diff --git a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml index 131689b610..dec46fde52 100644 --- a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml @@ -95,4 +95,3 @@ </fileSet> </fileSets> </component> - |