diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-22 01:26:40 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-22 01:26:40 +0000 |
commit | eda586500e025febdb539765355fe9acdc391bfd (patch) | |
tree | f957c467b2f07ac015af9614192abb6cfe41f18f /branches/sca-equinox/distribution/features | |
parent | 3ca9a77252f3885f80a4958a6fbafc518a5fd3a3 (diff) |
Adjusted poms to previous changes. Disabled the modules that depend on implementation-script as it's not split in two modules yet.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@697653 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
10 files changed, 23 insertions, 33 deletions
diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml index 905c67d066..f8fbd62e79 100644 --- a/branches/sca-equinox/distribution/features/all/pom.xml +++ b/branches/sca-equinox/distribution/features/all/pom.xml @@ -171,6 +171,7 @@ <module>../../../modules/binding-jsonrpc</module> <module>../../../modules/binding-jsonrpc-runtime</module> <module>../../../modules/binding-rmi</module> + <module>../../../modules/binding-rmi-runtime</module> <module>../../../modules/binding-rss</module> <module>../../../modules/binding-rss-rome</module> <module>../../../modules/binding-sca</module> @@ -207,7 +208,6 @@ <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> @@ -228,7 +228,6 @@ <module>../../../modules/implementation-node-runtime</module> <module>../../../modules/implementation-resource</module> <module>../../../modules/implementation-resource-runtime</module> - <module>../../../modules/implementation-script</module> <module>../../../modules/implementation-spring</module> <module>../../../modules/implementation-widget</module> <module>../../../modules/implementation-widget-runtime</module> diff --git a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml index 75cd0d81fb..18ec984770 100644 --- a/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/all/src/main/components/src-modules.xml @@ -44,6 +44,7 @@ <include>binding-jsonrpc/**/*</include> <include>binding-jsonrpc-runtime/**/*</include> <include>binding-rmi/**/*</include> + <include>binding-rmi-runtime/**/*</include> <include>binding-rss/**/*</include> <include>binding-rss-rome/**/*</include> <include>binding-sca/**/*</include> @@ -86,7 +87,6 @@ <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>extensibility-equinox/**/*</include> - <include>extension-helper/**/*</include> <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> @@ -107,7 +107,6 @@ <include>implementation-node-runtime/**/*</include> <include>implementation-resource/**/*</include> <include>implementation-resource-runtime/**/*</include> - <include>implementation-script/**/*</include> <include>implementation-spring/**/*</include> <include>implementation-widget/**/*</include> <include>implementation-widget-runtime/**/*</include> @@ -118,11 +117,6 @@ <include>interface-java-xml/**/*</include> <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> - <include>java2wsdl/**/*</include> - <include>maven-ant-generator/**/*</include> - <include>maven-incremental-build/**/*</include> - <include>maven-java2wsdl/**/*</include> - <include>maven-wsdl2java/**/*</include> <include>monitor/**/*</include> <include>monitor-logging/**/*</include> <include>node-api/**/*</include> @@ -143,7 +137,6 @@ <include>workspace/**/*</include> <include>workspace-impl/**/*</include> <include>workspace-xml/**/*</include> - <include>wsdl2java/**/*</include> <include>xsd/**/*</include> <include>xsd-xml/**/*</include> </includes> diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml index ea5b99be05..98d751f2d4 100644 --- a/branches/sca-equinox/distribution/features/core/pom.xml +++ b/branches/sca-equinox/distribution/features/core/pom.xml @@ -44,7 +44,7 @@ <version>1.4-SNAPSHOT</version> </dependency> - <!-- Corba binding --> + <!-- Bindings --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-corba-runtime</artifactId> @@ -130,7 +130,7 @@ <version>1.4-SNAPSHOT</version> </dependency> - <!-- Corba host --> + <!-- Hosts --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-corba-jse</artifactId> diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml index 5fb826d7fc..44294c2b01 100644 --- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml +++ b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -93,6 +93,7 @@ <exclude>javax.activation:activation</exclude> <exclude>javax.annotation:jsr250-api</exclude> <exclude>javax.jws:jsr181-api</exclude> + <exclude>javax.servlet:servlet-api</exclude> <exclude>javax.xml.bind:jaxb-api</exclude> <exclude>javax.xml.stream:stax-api</exclude> <exclude>javax.xml.ws:jaxws-api</exclude> diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml index 0ccbff2063..85fe239a11 100644 --- a/branches/sca-equinox/distribution/features/ejava/pom.xml +++ b/branches/sca-equinox/distribution/features/ejava/pom.xml @@ -43,39 +43,39 @@ <!-- Bindings --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ejb-runtime</artifactId> + <artifactId>tuscany-binding-rmi-runtime</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jms-runtime</artifactId> + <artifactId>tuscany-binding-ejb-runtime</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi</artifactId> + <artifactId>tuscany-binding-jms-runtime</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <!-- Hosts --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-corba-jee</artifactId> + <artifactId>tuscany-host-rmi</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-ejb</artifactId> + <artifactId>tuscany-host-corba-jee</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-openejb</artifactId> + <artifactId>tuscany-host-ejb</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-rmi</artifactId> + <artifactId>tuscany-host-openejb</artifactId> <version>1.4-SNAPSHOT</version> </dependency> @@ -148,6 +148,7 @@ <module>../../../modules/binding-jms</module> <module>../../../modules/binding-jms-runtime</module> <module>../../../modules/binding-rmi</module> + <module>../../../modules/binding-rmi-runtime</module> <module>../../../modules/binding-sca</module> <module>../../../modules/binding-sca-xml</module> <module>../../../modules/binding-ws</module> @@ -169,7 +170,6 @@ <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> @@ -184,7 +184,6 @@ <module>../../../modules/implementation-java-xml</module> <module>../../../modules/implementation-node</module> <module>../../../modules/implementation-node-runtime</module> - <module>../../../modules/implementation-script</module> <module>../../../modules/implementation-spring</module> <module>../../../modules/interface</module> <module>../../../modules/interface-java</module> diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml index 757c65d141..7e20c9c268 100644 --- a/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/ejava/src/main/components/src-modules.xml @@ -34,6 +34,7 @@ <include>binding-jms/**/*</include> <include>binding-jms-runtime/**/*</include> <include>binding-rmi/**/*</include> + <include>binding-rmi-runtime/**/*</include> <include>binding-sca/**/*</include> <include>binding-sca-xml/**/*</include> <include>binding-ws/**/*</include> @@ -56,7 +57,6 @@ <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>extensibility-equinox/**/*</include> - <include>extension-helper/**/*</include> <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> @@ -71,7 +71,6 @@ <include>implementation-java-xml/**/*</include> <include>implementation-node/**/*</include> <include>implementation-node-runtime/**/*</include> - <include>implementation-script/**/*</include> <include>implementation-spring/**/*</include> <include>interface/**/*</include> <include>interface-java/**/*</include> diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/features/manager/pom.xml index e184a3a123..456879dba6 100644 --- a/branches/sca-equinox/distribution/features/manager/pom.xml +++ b/branches/sca-equinox/distribution/features/manager/pom.xml @@ -63,6 +63,11 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-rmi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-rss</artifactId> <version>1.4-SNAPSHOT</version> </dependency> @@ -189,6 +194,7 @@ <module>../../../modules/binding-http</module> <module>../../../modules/binding-http-runtime</module> <module>../../../modules/binding-jsonrpc</module> + <module>../../../modules/binding-rmi</module> <module>../../../modules/binding-rss</module> <module>../../../modules/binding-sca</module> <module>../../../modules/binding-sca-xml</module> diff --git a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml index b8d9cd1b2c..6998402aa8 100644 --- a/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/manager/src/main/components/src-modules.xml @@ -35,6 +35,7 @@ <include>binding-http/**/*</include> <include>binding-http-runtime/**/*</include> <include>binding-jsonrpc/**/*</include> + <include>binding-rmi/**/*</include> <include>binding-rss/**/*</include> <include>binding-sca/**/*</include> <include>binding-sca-xml/**/*</include> diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml index 40ec381b2c..c8450af762 100644 --- a/branches/sca-equinox/distribution/features/repository/pom.xml +++ b/branches/sca-equinox/distribution/features/repository/pom.xml @@ -98,6 +98,7 @@ <module>../../../modules/binding-jsonrpc</module> <module>../../../modules/binding-jsonrpc-runtime</module> <module>../../../modules/binding-rmi</module> + <module>../../../modules/binding-rmi-runtime</module> <module>../../../modules/binding-rss</module> <module>../../../modules/binding-rss-rome</module> <module>../../../modules/binding-sca</module> @@ -134,7 +135,6 @@ <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> <module>../../../modules/extensibility-equinox</module> - <module>../../../modules/extension-helper</module> <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> @@ -155,7 +155,6 @@ <module>../../../modules/implementation-node-runtime</module> <module>../../../modules/implementation-resource</module> <module>../../../modules/implementation-resource-runtime</module> - <module>../../../modules/implementation-script</module> <module>../../../modules/implementation-spring</module> <module>../../../modules/implementation-widget</module> <module>../../../modules/implementation-widget-runtime</module> diff --git a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml index e7a59dee83..acee92e060 100644 --- a/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/repository/src/main/components/src-modules.xml @@ -44,6 +44,7 @@ <include>binding-jsonrpc/**/*</include> <include>binding-jsonrpc-runtime/**/*</include> <include>binding-rmi/**/*</include> + <include>binding-rmi-runtime/**/*</include> <include>binding-rss/**/*</include> <include>binding-rss-rome/**/*</include> <include>binding-sca/**/*</include> @@ -87,7 +88,6 @@ <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>extensibility-equinox/**/*</include> - <include>extension-helper/**/*</include> <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> @@ -108,7 +108,6 @@ <include>implementation-node-runtime/**/*</include> <include>implementation-resource/**/*</include> <include>implementation-resource-runtime/**/*</include> - <include>implementation-script/**/*</include> <include>implementation-spring/**/*</include> <include>implementation-widget/**/*</include> <include>implementation-widget-runtime/**/*</include> @@ -119,11 +118,6 @@ <include>interface-java-xml/**/*</include> <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> - <include>java2wsdl/**/*</include> - <include>maven-ant-generator/**/*</include> - <include>maven-incremental-build/**/*</include> - <include>maven-java2wsdl/**/*</include> - <include>maven-wsdl2java/**/*</include> <include>monitor/**/*</include> <include>monitor-logging/**/*</include> <include>node-api/**/*</include> @@ -144,7 +138,6 @@ <include>workspace/**/*</include> <include>workspace-impl/**/*</include> <include>workspace-xml/**/*</include> - <include>wsdl2java/**/*</include> <include>xsd/**/*</include> <include>xsd-xml/**/*</include> </includes> |