diff options
Diffstat (limited to 'branches/sca-android')
6 files changed, 2 insertions, 198 deletions
diff --git a/branches/sca-android/distribution/features/core/pom.xml b/branches/sca-android/distribution/features/core/pom.xml index 331d9af64e..f96bd7c430 100644 --- a/branches/sca-android/distribution/features/core/pom.xml +++ b/branches/sca-android/distribution/features/core/pom.xml @@ -211,8 +211,6 @@ <module>../../../modules/assembly</module> <module>../../../modules/assembly-xml</module> <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> <module>../../../modules/binding-sca</module> <module>../../../modules/binding-sca-xml</module> <module>../../../modules/contribution</module> @@ -223,17 +221,12 @@ <module>../../../modules/core</module> <module>../../../modules/core-databinding</module> <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> <module>../../../modules/databinding</module> <module>../../../modules/databinding-jaxb</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> - <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/implementation-java</module> <module>../../../modules/implementation-java-runtime</module> @@ -244,21 +237,14 @@ <module>../../../modules/interface-java</module> <module>../../../modules/interface-java-jaxws</module> <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> <module>../../../modules/policy-xml</module> <module>../../../modules/sca-api</module> <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml index 58d8ca1407..d009672310 100644 --- a/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml +++ b/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -30,8 +30,6 @@ <exclude>org.apache.tuscany.sca:tuscany-assembly</exclude> <exclude>org.apache.tuscany.sca:tuscany-assembly-xml</exclude> <exclude>org.apache.tuscany.sca:tuscany-assembly-xsd</exclude> - <exclude>org.apache.tuscany.sca:tuscany-binding-corba</exclude> - <exclude>org.apache.tuscany.sca:tuscany-binding-corba-runtime</exclude> <exclude>org.apache.tuscany.sca:tuscany-binding-sca</exclude> <exclude>org.apache.tuscany.sca:tuscany-binding-sca-xml</exclude> <exclude>org.apache.tuscany.sca:tuscany-contribution</exclude> @@ -42,17 +40,12 @@ <exclude>org.apache.tuscany.sca:tuscany-core</exclude> <exclude>org.apache.tuscany.sca:tuscany-core-databinding</exclude> <exclude>org.apache.tuscany.sca:tuscany-core-spi</exclude> - <exclude>org.apache.tuscany.sca:tuscany-data-api</exclude> <exclude>org.apache.tuscany.sca:tuscany-databinding</exclude> <exclude>org.apache.tuscany.sca:tuscany-databinding-jaxb</exclude> <exclude>org.apache.tuscany.sca:tuscany-definitions</exclude> <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-equinox</exclude> - <exclude>org.apache.tuscany.sca:tuscany-host-corba</exclude> - <exclude>org.apache.tuscany.sca:tuscany-host-corba-jse</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> <exclude>org.apache.tuscany.sca:tuscany-implementation-java-runtime</exclude> @@ -63,21 +56,14 @@ <exclude>org.apache.tuscany.sca:tuscany-interface-java</exclude> <exclude>org.apache.tuscany.sca:tuscany-interface-java-jaxws</exclude> <exclude>org.apache.tuscany.sca:tuscany-interface-java-xml</exclude> - <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> - <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> <exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude> <exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude> <exclude>org.apache.tuscany.sca:tuscany-xsd</exclude> - <exclude>org.apache.tuscany.sca:tuscany-xsd-xml</exclude> </excludes> </dependencySet> @@ -88,6 +74,7 @@ <excludes> <exclude>asm:asm-all</exclude> <exclude>cglib:cglib-nodep</exclude> + <exclude>com.sun:tools</exclude> <exclude>com.sun.xml.bind:jaxb-impl</exclude> <exclude>javax.activation:activation</exclude> <exclude>javax.annotation:jsr250-api</exclude> @@ -98,15 +85,6 @@ <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> </dependencySet> diff --git a/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml b/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml index f3e34d10f3..5b12e0b784 100644 --- a/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml +++ b/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml @@ -27,8 +27,6 @@ <include>assembly/**/*</include> <include>assembly-xml/**/*</include> <include>assembly-xsd/**/*</include> - <include>binding-corba/**/*</include> - <include>binding-corba-runtime/**/*</include> <include>binding-sca/**/*</include> <include>binding-sca-xml/**/*</include> <include>contribution/**/*</include> @@ -39,17 +37,12 @@ <include>core/**/*</include> <include>core-databinding/**/*</include> <include>core-spi/**/*</include> - <include>data-api/**/*</include> <include>databinding/**/*</include> <include>databinding-jaxb/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> - <include>extensibility-equinox/**/*</include> - <include>host-corba/**/*</include> - <include>host-corba-jse/**/*</include> - <include>host-embedded/**/*</include> <include>host-http/**/*</include> <include>implementation-java/**/*</include> <include>implementation-java-runtime/**/*</include> @@ -60,21 +53,14 @@ <include>interface-java/**/*</include> <include>interface-java-jaxws/**/*</include> <include>interface-java-xml/**/*</include> - <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> - <include>node-launcher-equinox/**/*</include> - <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> - <include>policy-security/**/*</include> <include>policy-xml/**/*</include> <include>sca-api/**/*</include> <include>xsd/**/*</include> - <include>xsd-xml/**/*</include> </includes> <excludes> <!-- General file/folders to exclude --> diff --git a/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh b/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh index 4d1327f518..5f321004b8 100755 --- a/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh +++ b/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh @@ -21,24 +21,6 @@ echo "Generate Maven files: core" cd core; ../etc/generate-filtered-dependencies.sh > src/main/components/bin-filtered-dependencies.xml; ../etc/generate-maven-files.sh -echo "Generate Maven files: ejava" -cd ../ejava; ../etc/generate-maven-files.sh - -echo "Generate Maven files: manager" -cd ../manager; ../etc/generate-maven-files.sh - -echo "Generate Maven files: process" -cd ../process; ../etc/generate-maven-files.sh - -echo "Generate Maven files: web20" -cd ../web20; ../etc/generate-maven-files.sh - -echo "Generate Maven files: webservice" -cd ../webservice; ../etc/generate-maven-files.sh - -echo "Generate Maven files: all" -cd ../all; ../etc/generate-maven-files.sh - echo "Generate Maven files: repository" cd ../repository; ../etc/generate-maven-files.sh diff --git a/branches/sca-android/distribution/features/repository/pom.xml b/branches/sca-android/distribution/features/repository/pom.xml index cfee564971..2c1e30c82d 100644 --- a/branches/sca-android/distribution/features/repository/pom.xml +++ b/branches/sca-android/distribution/features/repository/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-all</artifactId> + <artifactId>tuscany-distribution-core</artifactId> <type>pom</type> <version>1.4-SNAPSHOT</version> </dependency> @@ -81,98 +81,40 @@ <module>../../../modules/assembly</module> <module>../../../modules/assembly-xml</module> <module>../../../modules/assembly-xsd</module> - <module>../../../modules/binding-atom</module> - <module>../../../modules/binding-atom-abdera</module> - <module>../../../modules/binding-corba</module> - <module>../../../modules/binding-corba-runtime</module> - <module>../../../modules/binding-ejb</module> - <module>../../../modules/binding-ejb-runtime</module> - <module>../../../modules/binding-http</module> - <module>../../../modules/binding-http-runtime</module> - <module>../../../modules/binding-jms</module> - <module>../../../modules/binding-jms-runtime</module> - <module>../../../modules/binding-jsonrpc</module> - <module>../../../modules/binding-jsonrpc-runtime</module> - <module>../../../modules/binding-rss</module> - <module>../../../modules/binding-rss-rome</module> <module>../../../modules/binding-sca</module> - <module>../../../modules/binding-sca-axis2</module> <module>../../../modules/binding-sca-xml</module> - <module>../../../modules/binding-ws</module> - <module>../../../modules/binding-ws-axis2</module> - <module>../../../modules/binding-ws-wsdlgen</module> - <module>../../../modules/binding-ws-xml</module> <module>../../../modules/contribution</module> <module>../../../modules/contribution-impl</module> <module>../../../modules/contribution-java</module> <module>../../../modules/contribution-namespace</module> - <module>../../../modules/contribution-resource</module> <module>../../../modules/contribution-xml</module> <module>../../../modules/core</module> <module>../../../modules/core-databinding</module> <module>../../../modules/core-spi</module> - <module>../../../modules/data-api</module> <module>../../../modules/databinding</module> - <module>../../../modules/databinding-axiom</module> <module>../../../modules/databinding-jaxb</module> - <module>../../../modules/databinding-jaxb-axiom</module> - <module>../../../modules/databinding-json</module> - <module>../../../modules/databinding-saxon</module> - <module>../../../modules/databinding-sdo</module> - <module>../../../modules/databinding-sdo-axiom</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> - <module>../../../modules/domain-manager</module> <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-jse</module> - <module>../../../modules/host-ejb</module> - <module>../../../modules/host-embedded</module> <module>../../../modules/host-http</module> - <module>../../../modules/host-jetty</module> - <module>../../../modules/implementation-bpel</module> - <module>../../../modules/implementation-bpel-ode</module> - <module>../../../modules/implementation-ejb</module> <module>../../../modules/implementation-java</module> <module>../../../modules/implementation-java-runtime</module> <module>../../../modules/implementation-java-xml</module> <module>../../../modules/implementation-node</module> <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> - <module>../../../modules/implementation-xquery</module> <module>../../../modules/interface</module> <module>../../../modules/interface-java</module> <module>../../../modules/interface-java-jaxws</module> <module>../../../modules/interface-java-xml</module> - <module>../../../modules/interface-wsdl</module> - <module>../../../modules/interface-wsdl-xml</module> <module>../../../modules/monitor</module> - <module>../../../modules/monitor-logging</module> <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-equinox</module> - <module>../../../modules/node-launcher-webapp</module> - <module>../../../modules/node-manager</module> <module>../../../modules/policy</module> - <module>../../../modules/policy-security</module> - <module>../../../modules/policy-security-ws</module> <module>../../../modules/policy-xml</module> - <module>../../../modules/policy-xml-ws</module> <module>../../../modules/sca-api</module> - <module>../../../modules/workspace</module> - <module>../../../modules/workspace-impl</module> - <module>../../../modules/workspace-xml</module> <module>../../../modules/xsd</module> - <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml b/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml index a893bf5ce8..cef542b41c 100644 --- a/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml +++ b/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml @@ -27,111 +27,41 @@ <include>assembly/**/*</include> <include>assembly-xml/**/*</include> <include>assembly-xsd/**/*</include> - <include>binding-atom/**/*</include> - <include>binding-atom-abdera/**/*</include> - <include>binding-corba/**/*</include> - <include>binding-corba-runtime/**/*</include> - <include>binding-ejb/**/*</include> - <include>binding-ejb-runtime/**/*</include> - <include>binding-http/**/*</include> - <include>binding-http-runtime/**/*</include> - <include>binding-jms/**/*</include> - <include>binding-jms-runtime/**/*</include> - <include>binding-jsonrpc/**/*</include> - <include>binding-jsonrpc-runtime/**/*</include> - <include>binding-rss/**/*</include> - <include>binding-rss-rome/**/*</include> <include>binding-sca/**/*</include> - <include>binding-sca-axis2/**/*</include> <include>binding-sca-xml/**/*</include> - <include>binding-ws/**/*</include> - <include>binding-ws-axis2/**/*</include> - <include>binding-ws-wsdlgen/**/*</include> - <include>binding-ws-xml/**/*</include> <include>contribution/**/*</include> <include>contribution-impl/**/*</include> <include>contribution-java/**/*</include> <include>contribution-namespace/**/*</include> - <include>contribution-resource/**/*</include> <include>contribution-xml/**/*</include> <include>core/**/*</include> <include>core-databinding/**/*</include> <include>core-spi/**/*</include> - <include>data-api/**/*</include> <include>databinding/**/*</include> - <include>databinding-axiom/**/*</include> <include>databinding-jaxb/**/*</include> - <include>databinding-jaxb-axiom/**/*</include> - <include>databinding-json/**/*</include> - <include>databinding-saxon/**/*</include> - <include>databinding-sdo/**/*</include> - <include>databinding-sdo-axiom/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> - <include>distribution-all/**/*</include> <include>distribution-core/**/*</include> - <include>distribution-ejava/**/*</include> - <include>distribution-manager/**/*</include> - <include>distribution-process/**/*</include> - <include>distribution-web20/**/*</include> - <include>distribution-webservice/**/*</include> - <include>domain-manager/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> - <include>extensibility-equinox/**/*</include> - <include>extension-helper/**/*</include> - <include>host-corba/**/*</include> - <include>host-corba-jse/**/*</include> - <include>host-ejb/**/*</include> - <include>host-embedded/**/*</include> <include>host-http/**/*</include> - <include>host-jetty/**/*</include> - <include>implementation-bpel/**/*</include> - <include>implementation-bpel-ode/**/*</include> - <include>implementation-ejb/**/*</include> <include>implementation-java/**/*</include> <include>implementation-java-runtime/**/*</include> <include>implementation-java-xml/**/*</include> <include>implementation-node/**/*</include> <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> - <include>implementation-xquery/**/*</include> <include>interface/**/*</include> <include>interface-java/**/*</include> <include>interface-java-jaxws/**/*</include> <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> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-equinox/**/*</include> - <include>node-launcher-webapp/**/*</include> - <include>node-manager/**/*</include> <include>policy/**/*</include> - <include>policy-security/**/*</include> - <include>policy-security-ws/**/*</include> <include>policy-xml/**/*</include> - <include>policy-xml-ws/**/*</include> <include>sca-api/**/*</include> - <include>workspace/**/*</include> - <include>workspace-impl/**/*</include> - <include>workspace-xml/**/*</include> - <include>wsdl2java/**/*</include> <include>xsd/**/*</include> - <include>xsd-xml/**/*</include> </includes> <excludes> <!-- General file/folders to exclude --> |