From eda586500e025febdb539765355fe9acdc391bfd Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 22 Sep 2008 01:26:40 +0000 Subject: 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 --- branches/sca-equinox/demos/pom.xml | 2 ++ branches/sca-equinox/distribution/features/all/pom.xml | 3 +-- .../features/all/src/main/components/src-modules.xml | 9 +-------- branches/sca-equinox/distribution/features/core/pom.xml | 4 ++-- .../src/main/components/bin-filtered-dependencies.xml | 1 + .../sca-equinox/distribution/features/ejava/pom.xml | 17 ++++++++--------- .../features/ejava/src/main/components/src-modules.xml | 3 +-- .../sca-equinox/distribution/features/manager/pom.xml | 6 ++++++ .../manager/src/main/components/src-modules.xml | 1 + .../distribution/features/repository/pom.xml | 3 +-- .../repository/src/main/components/src-modules.xml | 9 +-------- branches/sca-equinox/modules/pom.xml | 13 ++++++++----- branches/sca-equinox/samples/pom.xml | 4 ++++ 13 files changed, 37 insertions(+), 38 deletions(-) (limited to 'branches/sca-equinox') diff --git a/branches/sca-equinox/demos/pom.xml b/branches/sca-equinox/demos/pom.xml index 420ad92c52..563a53935a 100644 --- a/branches/sca-equinox/demos/pom.xml +++ b/branches/sca-equinox/demos/pom.xml @@ -37,12 +37,14 @@ alert-aggregator-webapp + xml-bigbank 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 @@ ../../../modules/binding-jsonrpc ../../../modules/binding-jsonrpc-runtime ../../../modules/binding-rmi + ../../../modules/binding-rmi-runtime ../../../modules/binding-rss ../../../modules/binding-rss-rome ../../../modules/binding-sca @@ -207,7 +208,6 @@ ../../../modules/endpoint ../../../modules/extensibility ../../../modules/extensibility-equinox - ../../../modules/extension-helper ../../../modules/host-corba ../../../modules/host-corba-jee ../../../modules/host-corba-jse @@ -228,7 +228,6 @@ ../../../modules/implementation-node-runtime ../../../modules/implementation-resource ../../../modules/implementation-resource-runtime - ../../../modules/implementation-script ../../../modules/implementation-spring ../../../modules/implementation-widget ../../../modules/implementation-widget-runtime 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 @@ binding-jsonrpc/**/* binding-jsonrpc-runtime/**/* binding-rmi/**/* + binding-rmi-runtime/**/* binding-rss/**/* binding-rss-rome/**/* binding-sca/**/* @@ -86,7 +87,6 @@ endpoint/**/* extensibility/**/* extensibility-equinox/**/* - extension-helper/**/* host-corba/**/* host-corba-jee/**/* host-corba-jse/**/* @@ -107,7 +107,6 @@ implementation-node-runtime/**/* implementation-resource/**/* implementation-resource-runtime/**/* - implementation-script/**/* implementation-spring/**/* implementation-widget/**/* implementation-widget-runtime/**/* @@ -118,11 +117,6 @@ interface-java-xml/**/* interface-wsdl/**/* interface-wsdl-xml/**/* - java2wsdl/**/* - maven-ant-generator/**/* - maven-incremental-build/**/* - maven-java2wsdl/**/* - maven-wsdl2java/**/* monitor/**/* monitor-logging/**/* node-api/**/* @@ -143,7 +137,6 @@ workspace/**/* workspace-impl/**/* workspace-xml/**/* - wsdl2java/**/* xsd/**/* xsd-xml/**/* 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 @@ 1.4-SNAPSHOT - + org.apache.tuscany.sca tuscany-binding-corba-runtime @@ -130,7 +130,7 @@ 1.4-SNAPSHOT - + org.apache.tuscany.sca tuscany-host-corba-jse 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 @@ javax.activation:activation javax.annotation:jsr250-api javax.jws:jsr181-api + javax.servlet:servlet-api javax.xml.bind:jaxb-api javax.xml.stream:stax-api javax.xml.ws:jaxws-api 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 @@ org.apache.tuscany.sca - tuscany-binding-ejb-runtime + tuscany-binding-rmi-runtime 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-binding-jms-runtime + tuscany-binding-ejb-runtime 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-binding-rmi + tuscany-binding-jms-runtime 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-host-corba-jee + tuscany-host-rmi 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-host-ejb + tuscany-host-corba-jee 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-host-openejb + tuscany-host-ejb 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-host-rmi + tuscany-host-openejb 1.4-SNAPSHOT @@ -148,6 +148,7 @@ ../../../modules/binding-jms ../../../modules/binding-jms-runtime ../../../modules/binding-rmi + ../../../modules/binding-rmi-runtime ../../../modules/binding-sca ../../../modules/binding-sca-xml ../../../modules/binding-ws @@ -169,7 +170,6 @@ ../../../modules/endpoint ../../../modules/extensibility ../../../modules/extensibility-equinox - ../../../modules/extension-helper ../../../modules/host-corba ../../../modules/host-corba-jee ../../../modules/host-corba-jse @@ -184,7 +184,6 @@ ../../../modules/implementation-java-xml ../../../modules/implementation-node ../../../modules/implementation-node-runtime - ../../../modules/implementation-script ../../../modules/implementation-spring ../../../modules/interface ../../../modules/interface-java 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 @@ binding-jms/**/* binding-jms-runtime/**/* binding-rmi/**/* + binding-rmi-runtime/**/* binding-sca/**/* binding-sca-xml/**/* binding-ws/**/* @@ -56,7 +57,6 @@ endpoint/**/* extensibility/**/* extensibility-equinox/**/* - extension-helper/**/* host-corba/**/* host-corba-jee/**/* host-corba-jse/**/* @@ -71,7 +71,6 @@ implementation-java-xml/**/* implementation-node/**/* implementation-node-runtime/**/* - implementation-script/**/* implementation-spring/**/* interface/**/* interface-java/**/* 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 @@ -61,6 +61,11 @@ tuscany-binding-jsonrpc 1.4-SNAPSHOT + + org.apache.tuscany.sca + tuscany-binding-rmi + 1.4-SNAPSHOT + org.apache.tuscany.sca tuscany-binding-rss @@ -189,6 +194,7 @@ ../../../modules/binding-http ../../../modules/binding-http-runtime ../../../modules/binding-jsonrpc + ../../../modules/binding-rmi ../../../modules/binding-rss ../../../modules/binding-sca ../../../modules/binding-sca-xml 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 @@ binding-http/**/* binding-http-runtime/**/* binding-jsonrpc/**/* + binding-rmi/**/* binding-rss/**/* binding-sca/**/* binding-sca-xml/**/* 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 @@ ../../../modules/binding-jsonrpc ../../../modules/binding-jsonrpc-runtime ../../../modules/binding-rmi + ../../../modules/binding-rmi-runtime ../../../modules/binding-rss ../../../modules/binding-rss-rome ../../../modules/binding-sca @@ -134,7 +135,6 @@ ../../../modules/endpoint ../../../modules/extensibility ../../../modules/extensibility-equinox - ../../../modules/extension-helper ../../../modules/host-corba ../../../modules/host-corba-jee ../../../modules/host-corba-jse @@ -155,7 +155,6 @@ ../../../modules/implementation-node-runtime ../../../modules/implementation-resource ../../../modules/implementation-resource-runtime - ../../../modules/implementation-script ../../../modules/implementation-spring ../../../modules/implementation-widget ../../../modules/implementation-widget-runtime 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 @@ binding-jsonrpc/**/* binding-jsonrpc-runtime/**/* binding-rmi/**/* + binding-rmi-runtime/**/* binding-rss/**/* binding-rss-rome/**/* binding-sca/**/* @@ -87,7 +88,6 @@ endpoint/**/* extensibility/**/* extensibility-equinox/**/* - extension-helper/**/* host-corba/**/* host-corba-jee/**/* host-corba-jse/**/* @@ -108,7 +108,6 @@ implementation-node-runtime/**/* implementation-resource/**/* implementation-resource-runtime/**/* - implementation-script/**/* implementation-spring/**/* implementation-widget/**/* implementation-widget-runtime/**/* @@ -119,11 +118,6 @@ interface-java-xml/**/* interface-wsdl/**/* interface-wsdl-xml/**/* - java2wsdl/**/* - maven-ant-generator/**/* - maven-incremental-build/**/* - maven-java2wsdl/**/* - maven-wsdl2java/**/* monitor/**/* monitor-logging/**/* node-api/**/* @@ -144,7 +138,6 @@ workspace/**/* workspace-impl/**/* workspace-xml/**/* - wsdl2java/**/* xsd/**/* xsd-xml/**/* diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml index 3632a41ab6..058c5e2538 100644 --- a/branches/sca-equinox/modules/pom.xml +++ b/branches/sca-equinox/modules/pom.xml @@ -60,6 +60,7 @@ binding-jsonrpc binding-jsonrpc-runtime binding-rmi + binding-rmi-runtime binding-rss binding-rss-rome binding-sca @@ -97,7 +98,6 @@ endpoint extensibility extensibility-equinox - extension-helper host-corba host-corba-jee host-corba-jse @@ -105,14 +105,14 @@ host-ejb host-embedded host-http + host-jetty host-openejb host-rmi - host-webapp - host-webapp-junit - host-jetty + host-webapp + host-webapp-junit interface interface-java interface-java-jaxws @@ -130,7 +130,10 @@ implementation-node-runtime implementation-resource implementation-resource-runtime + implementation-spring implementation-widget implementation-widget-runtime diff --git a/branches/sca-equinox/samples/pom.xml b/branches/sca-equinox/samples/pom.xml index 2742c930eb..6e1497afb9 100644 --- a/branches/sca-equinox/samples/pom.xml +++ b/branches/sca-equinox/samples/pom.xml @@ -53,7 +53,9 @@ calculator-rcp calculator-rmi-reference calculator-rmi-service + calculator-webapp calculator-ws-secure-webapp calculator-ws-webapp @@ -94,9 +96,11 @@ simple-bigbank-spring simple-callback simple-callback-ws + store store-distributed supplychain -- cgit v1.2.3