diff options
13 files changed, 5 insertions, 31 deletions
diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml index a14ba9512d..86eb319ad8 100644 --- a/branches/sca-equinox/distribution/features/all/pom.xml +++ b/branches/sca-equinox/distribution/features/all/pom.xml @@ -173,6 +173,7 @@ <module>../../../modules/binding-sca-xml</module> <module>../../../modules/binding-ws</module> <module>../../../modules/binding-ws-axis2</module> + <module>../../../modules/binding-ws-axis2-policy</module> <module>../../../modules/binding-ws-wsdlgen</module> <module>../../../modules/binding-ws-xml</module> <module>../../../modules/contribution</module> @@ -195,7 +196,6 @@ <module>../../../modules/databinding-sdo</module> <module>../../../modules/databinding-sdo-axiom</module> <module>../../../modules/databinding-xmlbeans</module> - <module>../../../modules/data-engine-helper</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> <module>../../../modules/domain-manager</module> @@ -205,15 +205,12 @@ <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> <module>../../../modules/host-jetty</module> - <module>../../../modules/host-openejb</module> <module>../../../modules/host-rmi</module> <module>../../../modules/implementation-bpel</module> <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-das</module> <module>../../../modules/implementation-ejb</module> <module>../../../modules/implementation-java</module> <module>../../../modules/implementation-java-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 67dd932704..6f8750d19d 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 @@ -52,6 +52,7 @@ <include>binding-sca-xml/**/*</include> <include>binding-ws/**/*</include> <include>binding-ws-axis2/**/*</include> + <include>binding-ws-axis2-policy/**/*</include> <include>binding-ws-wsdlgen/**/*</include> <include>binding-ws-xml/**/*</include> <include>contribution/**/*</include> @@ -74,7 +75,6 @@ <include>databinding-sdo/**/*</include> <include>databinding-sdo-axiom/**/*</include> <include>databinding-xmlbeans/**/*</include> - <include>data-engine-helper/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>distribution-core/**/*</include> @@ -90,15 +90,12 @@ <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> - <include>host-ejb/**/*</include> <include>host-embedded/**/*</include> <include>host-http/**/*</include> <include>host-jetty/**/*</include> - <include>host-openejb/**/*</include> <include>host-rmi/**/*</include> <include>implementation-bpel/**/*</include> <include>implementation-bpel-ode/**/*</include> - <include>implementation-das/**/*</include> <include>implementation-ejb/**/*</include> <include>implementation-java/**/*</include> <include>implementation-java-runtime/**/*</include> @@ -120,7 +117,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> 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 44294c2b01..ee10890d84 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 @@ -65,7 +65,6 @@ <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl</exclude> <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl-xml</exclude> <exclude>org.apache.tuscany.sca:tuscany-monitor</exclude> - <exclude>org.apache.tuscany.sca:tuscany-monitor-logging</exclude> <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> diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml index 20cd6c0e4f..91573a79a7 100644 --- a/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/core/src/main/components/src-modules.xml @@ -62,7 +62,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml index 9ba5cde2b0..4e4ba94cd3 100644 --- a/branches/sca-equinox/distribution/features/ejava/pom.xml +++ b/branches/sca-equinox/distribution/features/ejava/pom.xml @@ -175,10 +175,8 @@ <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> - <module>../../../modules/host-openejb</module> <module>../../../modules/host-rmi</module> <module>../../../modules/implementation-ejb</module> <module>../../../modules/implementation-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 7e20c9c268..9bd1e51781 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 @@ -60,10 +60,8 @@ <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> - <include>host-ejb/**/*</include> <include>host-embedded/**/*</include> <include>host-http/**/*</include> - <include>host-openejb/**/*</include> <include>host-rmi/**/*</include> <include>implementation-ejb/**/*</include> <include>implementation-java/**/*</include> @@ -79,7 +77,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> 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 6998402aa8..4fb71652f5 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 @@ -83,7 +83,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> diff --git a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml index ad0e954902..dacda26919 100644 --- a/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/process/src/main/components/src-modules.xml @@ -69,7 +69,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml index da7105461e..9aeae08199 100644 --- a/branches/sca-equinox/distribution/features/repository/pom.xml +++ b/branches/sca-equinox/distribution/features/repository/pom.xml @@ -106,6 +106,7 @@ <module>../../../modules/binding-sca-xml</module> <module>../../../modules/binding-ws</module> <module>../../../modules/binding-ws-axis2</module> + <module>../../../modules/binding-ws-axis2-policy</module> <module>../../../modules/binding-ws-wsdlgen</module> <module>../../../modules/binding-ws-xml</module> <module>../../../modules/contribution</module> @@ -128,7 +129,6 @@ <module>../../../modules/databinding-sdo</module> <module>../../../modules/databinding-sdo-axiom</module> <module>../../../modules/databinding-xmlbeans</module> - <module>../../../modules/data-engine-helper</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> <module>../../../modules/domain-manager</module> @@ -138,15 +138,12 @@ <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jee</module> <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-ejb</module> <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> <module>../../../modules/host-jetty</module> - <module>../../../modules/host-openejb</module> <module>../../../modules/host-rmi</module> <module>../../../modules/implementation-bpel</module> <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-das</module> <module>../../../modules/implementation-ejb</module> <module>../../../modules/implementation-java</module> <module>../../../modules/implementation-java-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 1754539cd0..02f37b4b70 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 @@ -52,6 +52,7 @@ <include>binding-sca-xml/**/*</include> <include>binding-ws/**/*</include> <include>binding-ws-axis2/**/*</include> + <include>binding-ws-axis2-policy/**/*</include> <include>binding-ws-wsdlgen/**/*</include> <include>binding-ws-xml/**/*</include> <include>contribution/**/*</include> @@ -74,7 +75,6 @@ <include>databinding-sdo/**/*</include> <include>databinding-sdo-axiom/**/*</include> <include>databinding-xmlbeans/**/*</include> - <include>data-engine-helper/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>distribution-all/**/*</include> @@ -91,15 +91,12 @@ <include>host-corba/**/*</include> <include>host-corba-jee/**/*</include> <include>host-corba-jse/**/*</include> - <include>host-ejb/**/*</include> <include>host-embedded/**/*</include> <include>host-http/**/*</include> <include>host-jetty/**/*</include> - <include>host-openejb/**/*</include> <include>host-rmi/**/*</include> <include>implementation-bpel/**/*</include> <include>implementation-bpel-ode/**/*</include> - <include>implementation-das/**/*</include> <include>implementation-ejb/**/*</include> <include>implementation-java/**/*</include> <include>implementation-java-runtime/**/*</include> @@ -121,7 +118,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> diff --git a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml index df51f57953..e8e6919b9e 100644 --- a/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/web20/src/main/components/src-modules.xml @@ -80,7 +80,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/features/webservice/pom.xml index dea8d8ac0a..abb0e6e51e 100644 --- a/branches/sca-equinox/distribution/features/webservice/pom.xml +++ b/branches/sca-equinox/distribution/features/webservice/pom.xml @@ -189,7 +189,6 @@ <module>../../../modules/extensibility-equinox</module> <module>../../../modules/host-corba</module> <module>../../../modules/host-corba-jse</module> - <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> <module>../../../modules/host-jetty</module> <module>../../../modules/implementation-java</module> diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml index 29226bee5c..0b27ebd5af 100644 --- a/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml +++ b/branches/sca-equinox/distribution/features/webservice/src/main/components/src-modules.xml @@ -34,6 +34,7 @@ <include>binding-sca-xml/**/*</include> <include>binding-ws/**/*</include> <include>binding-ws-axis2/**/*</include> + <include>binding-ws-axis2-policy/**/*</include> <include>binding-ws-wsdlgen/**/*</include> <include>binding-ws-xml/**/*</include> <include>contribution/**/*</include> @@ -59,7 +60,6 @@ <include>extensibility-equinox/**/*</include> <include>host-corba/**/*</include> <include>host-corba-jse/**/*</include> - <include>host-embedded/**/*</include> <include>host-http/**/*</include> <include>host-jetty/**/*</include> <include>implementation-java/**/*</include> @@ -74,7 +74,6 @@ <include>interface-wsdl/**/*</include> <include>interface-wsdl-xml/**/*</include> <include>monitor/**/*</include> - <include>monitor-logging/**/*</include> <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> |