From e2eb32676f17d9f7e1fa67902914124f956392cb Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 25 Aug 2008 15:55:15 +0000 Subject: Simplified the distribution builds, use Maven assembly component descriptors to share definitions. Added a few scripts to help maintain some of the descriptors, eventually they should be converted to Maven plugins. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@688767 13f79535-47bb-0310-9956-ffa450edef68 --- .../features/all/src/main/assembly/bin.xml | 125 ++---------------- .../features/all/src/main/assembly/src.xml | 144 ++------------------- java/sca/distribution/features/core/pom.xml | 39 ++++-- .../features/core/src/main/assembly/bin.xml | 89 +------------ .../features/core/src/main/assembly/src.xml | 88 +------------ .../core/src/main/components/bin-common.xml | 44 +++++++ .../core/src/main/components/bin-dependencies.xml | 41 ++++++ .../src/main/components/bin-down-dependencies.xml | 103 +++++++++++++++ .../core/src/main/components/bin-samples.xml | 54 ++++++++ .../core/src/main/components/src-common.xml | 42 ++++++ .../core/src/main/components/src-modules.xml | 86 ++++++++++++ .../features/ejava/src/main/assembly/bin.xml | 80 +----------- .../features/ejava/src/main/assembly/src.xml | 100 +------------- .../ejava/src/main/components/bin-samples.xml | 44 +++++++ .../ejava/src/main/components/src-modules.xml | 86 ++++++++++++ .../features/etc/generate-down-dependencies.sh | 70 ++++++++++ .../features/etc/generate-maven-files.sh | 23 ++++ java/sca/distribution/features/etc/generate-pom.sh | 18 +-- .../features/etc/generate-src-modules.sh | 66 ++++++++++ java/sca/distribution/features/manager/pom.xml | 21 ++- .../features/manager/src/main/assembly/bin.xml | 78 +---------- .../features/manager/src/main/assembly/src.xml | 113 +--------------- .../manager/src/main/components/bin-samples.xml | 42 ++++++ .../manager/src/main/components/src-modules.xml | 86 ++++++++++++ java/sca/distribution/features/process/pom.xml | 8 -- .../features/process/src/main/assembly/bin.xml | 80 +----------- .../features/process/src/main/assembly/src.xml | 106 +-------------- .../process/src/main/components/bin-samples.xml | 44 +++++++ .../process/src/main/components/src-modules.xml | 86 ++++++++++++ .../features/web20/src/main/assembly/bin.xml | 80 +----------- .../features/web20/src/main/assembly/src.xml | 105 +-------------- .../web20/src/main/components/bin-samples.xml | 44 +++++++ .../web20/src/main/components/src-modules.xml | 86 ++++++++++++ .../features/webservice/src/main/assembly/bin.xml | 86 +----------- .../features/webservice/src/main/assembly/src.xml | 100 +------------- .../webservice/src/main/components/bin-samples.xml | 50 +++++++ .../webservice/src/main/components/src-modules.xml | 86 ++++++++++++ 37 files changed, 1308 insertions(+), 1335 deletions(-) create mode 100644 java/sca/distribution/features/core/src/main/components/bin-common.xml create mode 100644 java/sca/distribution/features/core/src/main/components/bin-dependencies.xml create mode 100644 java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml create mode 100644 java/sca/distribution/features/core/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/core/src/main/components/src-common.xml create mode 100644 java/sca/distribution/features/core/src/main/components/src-modules.xml create mode 100644 java/sca/distribution/features/ejava/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/ejava/src/main/components/src-modules.xml create mode 100755 java/sca/distribution/features/etc/generate-down-dependencies.sh create mode 100755 java/sca/distribution/features/etc/generate-maven-files.sh create mode 100755 java/sca/distribution/features/etc/generate-src-modules.sh create mode 100644 java/sca/distribution/features/manager/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/manager/src/main/components/src-modules.xml create mode 100644 java/sca/distribution/features/process/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/process/src/main/components/src-modules.xml create mode 100644 java/sca/distribution/features/web20/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/web20/src/main/components/src-modules.xml create mode 100644 java/sca/distribution/features/webservice/src/main/components/bin-samples.xml create mode 100644 java/sca/distribution/features/webservice/src/main/components/src-modules.xml (limited to 'java/sca') diff --git a/java/sca/distribution/features/all/src/main/assembly/bin.xml b/java/sca/distribution/features/all/src/main/assembly/bin.xml index 350cd19a1c..5e21cc7a0f 100644 --- a/java/sca/distribution/features/all/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/all/src/main/assembly/bin.xml @@ -30,119 +30,14 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - - - calculator/**/* - binding-echo/**/* - binding-echo-extension/**/* - databinding-echo/**/* - implementation-composite/**/* - implementation-crud/**/* - implementation-crud-extension/**/* - implementation-pojo-extension/**/* - loanapplication/**/* - simple-bigbank/**/* - simple-callback/**/* - supplychain/**/* - domain-management/**/* - - - helloworld-bpel/**/* - helloworld-bpel-ws/**/* - quote-xquery/**/* - - - domain-management/**/* - - - helloworld-bpel/**/* - helloworld-bpel-ws/**/* - quote-xquery/**/* - - - feed-aggregator/**/* - store/**/* - web-resource/**/* - - - callback-ws-client/**/* - callback-ws-service/**/* - helloworld-ws-reference/**/* - helloworld-ws-service/**/* - helloworld-ws-reference-secure/**/* - helloworld-ws-service-secure/**/* - simple-callback-ws/**/* - zipcode-jaxws/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-dependencies.xml + ../core/src/main/components/bin-samples.xml + ../ejava/src/main/components/bin-samples.xml + ../manager/src/main/components/bin-samples.xml + ../process/src/main/components/bin-samples.xml + ../web20/src/main/components/bin-samples.xml + ../webservice/src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/all/src/main/assembly/src.xml b/java/sca/distribution/features/all/src/main/assembly/src.xml index 8ffe74337a..7a57773572 100644 --- a/java/sca/distribution/features/all/src/main/assembly/src.xml +++ b/java/sca/distribution/features/all/src/main/assembly/src.xml @@ -30,139 +30,13 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-atom/**/* - binding-atom-abdera/**/* - binding-ejb/**/* - binding-ejb-runtime/**/* - binding-http/**/* - binding-http-runtime/**/* - binding-jms/**/* - binding-jms-runtime/**/* - binding-jsonrpc/**/* - binding-jsonrpc-runtime/**/* - binding-rss/**/* - binding-rss-rome/**/* - binding-sca/**/* - binding-sca-axis2/**/* - binding-sca-xml/**/* - binding-ws/**/* - binding-ws-axis2/**/* - binding-ws-wsdlgen/**/* - binding-ws-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-resource/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-axiom/**/* - databinding-jaxb/**/* - databinding-jaxb-axiom/**/* - databinding-json/**/* - databinding-saxon/**/* - databinding-sdo/**/* - definitions/**/* - definitions-xml/**/* - distribution-all/**/* - distribution-core/**/* - distribution-ejava/**/* - distribution-manager/**/* - distribution-process/**/* - distribution-web20/**/* - distribution-webservice/**/* - domain-manager/**/* - endpoint/**/* - extensibility/**/* - extension-helper/**/* - host-ejb/**/* - host-embedded/**/* - host-http/**/* - host-jetty/**/* - implementation-bpel/**/* - implementation-bpel-ode/**/* - implementation-ejb/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - implementation-resource/**/* - implementation-resource-runtime/**/* - implementation-script/**/* - implementation-spring/**/* - implementation-widget/**/* - implementation-widget-runtime/**/* - implementation-xquery/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - monitor-logging/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - node-manager/**/* - policy/**/* - policy-security/**/* - policy-security-ws/**/* - policy-xml/**/* - policy-xml-ws/**/* - sca-api/**/* - workspace/**/* - workspace-impl/**/* - workspace-xml/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + ../core/src/main/components/src-modules.xml + ../ejava/src/main/components/src-modules.xml + ../manager/src/main/components/src-modules.xml + ../process/src/main/components/src-modules.xml + ../web20/src/main/components/src-modules.xml + ../webservice/src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index c9f59237b6..9295d20690 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -111,13 +111,6 @@ 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - org.apache.tuscany.sca @@ -150,20 +143,38 @@ org.apache.tuscany.sca - tuscany-node2-api + tuscany-node-api + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-node-impl 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-node2-impl + tuscany-node-launcher 1.4-SNAPSHOT org.apache.tuscany.sca - tuscany-node2-launcher + tuscany-node-launcher-webapp 1.4-SNAPSHOT + war + + + org.apache.tuscany.sca + tuscany-monitor + 1.4-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-monitor-logging + 1.4-SNAPSHOT + + org.apache.tuscany.sca @@ -240,9 +251,11 @@ ../../../modules/interface-wsdl ../../../modules/interface-wsdl-xml ../../../modules/monitor - ../../../modules/node2-api - ../../../modules/node2-impl - ../../../modules/node2-launcher + ../../../modules/monitor-logging + ../../../modules/node-api + ../../../modules/node-impl + ../../../modules/node-launcher + ../../../modules/node-launcher-webapp ../../../modules/policy ../../../modules/policy-security ../../../modules/policy-xml diff --git a/java/sca/distribution/features/core/src/main/assembly/bin.xml b/java/sca/distribution/features/core/src/main/assembly/bin.xml index 04ac5f01cd..76b6b87c1e 100644 --- a/java/sca/distribution/features/core/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/core/src/main/assembly/bin.xml @@ -30,88 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - calculator/**/* - binding-echo/**/* - binding-echo-extension/**/* - databinding-echo/**/* - implementation-composite/**/* - implementation-crud/**/* - implementation-crud-extension/**/* - implementation-pojo-extension/**/* - loanapplication/**/* - simple-bigbank/**/* - simple-callback/**/* - supplychain/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-dependencies.xml + ../core/src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/distribution/features/core/src/main/assembly/src.xml index fa176334de..0d2c7eab32 100644 --- a/java/sca/distribution/features/core/src/main/assembly/src.xml +++ b/java/sca/distribution/features/core/src/main/assembly/src.xml @@ -30,88 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-sca/**/* - binding-sca-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-jaxb/**/* - definitions/**/* - definitions-xml/**/* - endpoint/**/* - extensibility/**/* - host-embedded/**/* - host-http/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - policy/**/* - policy-security/**/* - policy-xml/**/* - sca-api/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + ../core/src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/core/src/main/components/bin-common.xml b/java/sca/distribution/features/core/src/main/components/bin-common.xml new file mode 100644 index 0000000000..c69e8e3699 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/bin-common.xml @@ -0,0 +1,44 @@ + + + + + + + src/main/release + + + CHANGES + DISCLAIMER + README + RELEASE_NOTES + + + + src/main/release/bin + + + INSTALL + LICENSE + NOTICE + + + + + diff --git a/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml new file mode 100644 index 0000000000..a1bde3932b --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/bin-dependencies.xml @@ -0,0 +1,41 @@ + + + + + + + modules + false + + org.apache.tuscany.sca:* + + + + + + lib + false + + org.apache.tuscany.sca:* + + + + + diff --git a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml new file mode 100644 index 0000000000..94f9cf6e2e --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml @@ -0,0 +1,103 @@ + + + + + + + modules + false + true + + org.apache.tuscany.sca:* + + + org.apache.tuscany.sca:tuscany-assembly + org.apache.tuscany.sca:tuscany-assembly-xml + org.apache.tuscany.sca:tuscany-assembly-xsd + org.apache.tuscany.sca:tuscany-binding-sca + org.apache.tuscany.sca:tuscany-binding-sca-xml + org.apache.tuscany.sca:tuscany-contribution + org.apache.tuscany.sca:tuscany-contribution-impl + org.apache.tuscany.sca:tuscany-contribution-java + org.apache.tuscany.sca:tuscany-contribution-namespace + org.apache.tuscany.sca:tuscany-contribution-xml + org.apache.tuscany.sca:tuscany-core + org.apache.tuscany.sca:tuscany-core-databinding + org.apache.tuscany.sca:tuscany-core-spi + org.apache.tuscany.sca:tuscany-data-api + org.apache.tuscany.sca:tuscany-databinding + org.apache.tuscany.sca:tuscany-databinding-jaxb + org.apache.tuscany.sca:tuscany-definitions + org.apache.tuscany.sca:tuscany-definitions-xml + org.apache.tuscany.sca:tuscany-endpoint + org.apache.tuscany.sca:tuscany-extensibility + org.apache.tuscany.sca:tuscany-host-embedded + org.apache.tuscany.sca:tuscany-host-http + org.apache.tuscany.sca:tuscany-implementation-java + org.apache.tuscany.sca:tuscany-implementation-java-runtime + org.apache.tuscany.sca:tuscany-implementation-java-xml + org.apache.tuscany.sca:tuscany-implementation-node + org.apache.tuscany.sca:tuscany-implementation-node-runtime + org.apache.tuscany.sca:tuscany-interface + org.apache.tuscany.sca:tuscany-interface-java + org.apache.tuscany.sca:tuscany-interface-java-jaxws + org.apache.tuscany.sca:tuscany-interface-java-xml + org.apache.tuscany.sca:tuscany-interface-wsdl + org.apache.tuscany.sca:tuscany-interface-wsdl-xml + org.apache.tuscany.sca:tuscany-monitor + org.apache.tuscany.sca:tuscany-monitor-logging + org.apache.tuscany.sca:tuscany-node-api + org.apache.tuscany.sca:tuscany-node-impl + org.apache.tuscany.sca:tuscany-node-launcher + org.apache.tuscany.sca:tuscany-node-launcher-webapp + org.apache.tuscany.sca:tuscany-policy + org.apache.tuscany.sca:tuscany-policy-security + org.apache.tuscany.sca:tuscany-policy-xml + org.apache.tuscany.sca:tuscany-sca-api + org.apache.tuscany.sca:tuscany-xsd + org.apache.tuscany.sca:tuscany-xsd-xml + org.apache.tuscany.sca:tuscany-distribution-core:pom + + + + + + lib + false + true + + asm:asm-all + cglib:cglib-nodep + com.sun.xml.bind:jaxb-impl + javax.activation:activation + javax.annotation:jsr250-api + javax.jws:jsr181-api + javax.xml.bind:jaxb-api + javax.xml.stream:stax-api + javax.xml.ws:jaxws-api + org.apache.geronimo.specs:geronimo-commonj_1.1_spec + org.apache.ws.commons.schema:XmlSchema + org.codehaus.woodstox:wstx-asl + wsdl4j:wsdl4j + org.apache.tuscany.sca:* + + + + diff --git a/java/sca/distribution/features/core/src/main/components/bin-samples.xml b/java/sca/distribution/features/core/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..fbe46a296c --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/bin-samples.xml @@ -0,0 +1,54 @@ + + + + + + + ../../../samples + samples + + calculator/**/* + calculator-lean/**/* + binding-echo/**/* + binding-echo-extension/**/* + databinding-echo/**/* + implementation-composite/**/* + implementation-crud/**/* + implementation-crud-extension/**/* + implementation-pojo-extension/**/* + loanapplication/**/* + simple-bigbank/**/* + simple-callback/**/* + supplychain/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/core/src/main/components/src-common.xml b/java/sca/distribution/features/core/src/main/components/src-common.xml new file mode 100644 index 0000000000..002df33fc7 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/src-common.xml @@ -0,0 +1,42 @@ + + + + + src/main/release + + + CHANGES + DISCLAIMER + README + RELEASE_NOTES + + + + src/main/release/src + + + BUILDING + LICENSE + NOTICE + + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml index 54902a9bfb..85c8de5239 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml @@ -30,79 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - helloworld-reference-jms/**/* - helloworld-service-jms/**/* - simple-bigbank-spring/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-down-dependencies.xml + src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/ejava/src/main/assembly/src.xml b/java/sca/distribution/features/ejava/src/main/assembly/src.xml index f09965c4b7..0d832271b9 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/src.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/src.xml @@ -30,100 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-ejb/**/* - binding-ejb-runtime/**/* - binding-jms/**/* - binding-jms-runtime/**/* - binding-sca/**/* - binding-sca-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-axiom/**/* - databinding-jaxb/**/* - definitions/**/* - definitions-xml/**/* - distribution-core/**/* - distribution-ejava/**/* - endpoint/**/* - extensibility/**/* - extension-helper/**/* - host-ejb/**/* - host-embedded/**/* - host-http/**/* - implementation-ejb/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - implementation-script/**/* - implementation-spring/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - policy/**/* - policy-security/**/* - policy-xml/**/* - sca-api/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml b/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..f1c691965b --- /dev/null +++ b/java/sca/distribution/features/ejava/src/main/components/bin-samples.xml @@ -0,0 +1,44 @@ + + + + + + + ../../../samples + samples + + helloworld-reference-jms/**/* + helloworld-service-jms/**/* + simple-bigbank-spring/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/etc/generate-down-dependencies.sh b/java/sca/distribution/features/etc/generate-down-dependencies.sh new file mode 100755 index 0000000000..9898835c25 --- /dev/null +++ b/java/sca/distribution/features/etc/generate-down-dependencies.sh @@ -0,0 +1,70 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# This generates a Maven assembly component that can be included in a Maven +# assembly to include the source of the modules in a source distribution. + +echo "" +echo "" +echo " " +echo "" +echo " " +echo " " +echo " modules" +echo " false" +echo " true" +echo " " +echo " org.apache.tuscany.sca:*" +echo " " +echo " " +mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " %s\n", $1 }' +echo " " +echo " " +echo "" +echo " " +echo " " +echo " lib" +echo " false" +echo " true" +echo " " +mvn -o dependency:list | awk '/.INFO. (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " %s\n", $1 }' +echo " org.apache.tuscany.sca:*" +echo " " +echo " " +echo " " + + +echo "" +echo "" + diff --git a/java/sca/distribution/features/etc/generate-maven-files.sh b/java/sca/distribution/features/etc/generate-maven-files.sh new file mode 100755 index 0000000000..ecff6aeab0 --- /dev/null +++ b/java/sca/distribution/features/etc/generate-maven-files.sh @@ -0,0 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# This script can be used to generate Maven build POM and assembly files +# for a distribution + +../etc/generate-src-modules.sh > src/main/components/src-modules.xml +../etc/generate-pom.sh > pom.xml + diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/distribution/features/etc/generate-pom.sh index cf53e890d9..b901f8cffc 100755 --- a/java/sca/distribution/features/etc/generate-pom.sh +++ b/java/sca/distribution/features/etc/generate-pom.sh @@ -15,26 +15,20 @@ # specific language governing permissions and limitations # under the License. -# After building a distribution, this script can be used to -# generate a Maven build profile that includes all the modules -# included directly or transitively in that distribution +# This script can be used to generate a Maven build profile that includes all +# the modules included directly or transitively in a distribution + +cat pom.xml | awk 'BEGIN { i=0 } // { i=1; print } /.*/ { if (i==0) print } ' echo " " echo " modules" echo " " -unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " ../../../modules/%s\n", $1 }' +mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " ../../../modules/%s\n", $1 }' echo " " echo " " echo "" -# This generates a list of includes that can be included in a -# Maven assembly fileset, to include the source of the modules -# in a source distribution for example - -echo " " -unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " %s/**/*\n", $1 }' -echo " " -echo "" +cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } ' diff --git a/java/sca/distribution/features/etc/generate-src-modules.sh b/java/sca/distribution/features/etc/generate-src-modules.sh new file mode 100755 index 0000000000..198636993d --- /dev/null +++ b/java/sca/distribution/features/etc/generate-src-modules.sh @@ -0,0 +1,66 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# This generates a Maven assembly component that can be included in a Maven +# assembly to include the source of the modules in a source distribution. + +echo "" +echo "" +echo " " +echo "" +echo " " +echo " " +echo " ../../../modules" +echo " modules" +echo " " + +mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " %s/**/*\n", $1 }' + +echo " " +echo " " +echo " " +echo " **/.*" +echo " **/.*/**" +echo " **/*.log" +echo "" +echo " " +echo " pom.xml" +echo " **/target" +echo " **/target/**/*" +echo " " +echo " " +echo " " +echo "" +echo "" + diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index 898301679a..627f9e3902 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -31,13 +31,14 @@ pom - + org.apache.tuscany.sca tuscany-distribution-core pom 1.4-SNAPSHOT + runtime @@ -45,36 +46,43 @@ org.apache.tuscany.sca tuscany-binding-atom 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-ejb 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-http 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-jsonrpc 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-rss 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-sca-xml 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-binding-ws-xml 1.4-SNAPSHOT + runtime @@ -82,16 +90,19 @@ org.apache.tuscany.sca tuscany-contribution-java 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-contribution-namespace 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-contribution-resource 1.4-SNAPSHOT + runtime @@ -99,11 +110,13 @@ org.apache.tuscany.sca tuscany-domain-manager 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-node-manager 1.4-SNAPSHOT + runtime @@ -111,31 +124,37 @@ org.apache.tuscany.sca tuscany-implementation-bpel 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-implementation-ejb 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-implementation-java-xml 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-implementation-node 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-implementation-resource 1.4-SNAPSHOT + runtime org.apache.tuscany.sca tuscany-implementation-widget 1.4-SNAPSHOT + runtime diff --git a/java/sca/distribution/features/manager/src/main/assembly/bin.xml b/java/sca/distribution/features/manager/src/main/assembly/bin.xml index 18f44c6277..85c8de5239 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/bin.xml @@ -30,77 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - domain-management/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-down-dependencies.xml + src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/manager/src/main/assembly/src.xml b/java/sca/distribution/features/manager/src/main/assembly/src.xml index 2dad1ffb3e..0d832271b9 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/src.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/src.xml @@ -30,113 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-atom/**/* - binding-atom-abdera/**/* - binding-ejb/**/* - binding-http/**/* - binding-jsonrpc/**/* - binding-rss/**/* - binding-sca/**/* - binding-sca-xml/**/* - binding-ws/**/* - binding-ws-wsdlgen/**/* - binding-ws-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-resource/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-jaxb/**/* - definitions/**/* - definitions-xml/**/* - distribution-core/**/* - distribution-manager/**/* - domain-manager/**/* - endpoint/**/* - extensibility/**/* - host-embedded/**/* - host-http/**/* - host-jetty/**/* - implementation-bpel/**/* - implementation-ejb/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - implementation-resource/**/* - implementation-widget/**/* - implementation-widget-runtime/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - monitor-logging/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - node-manager/**/* - policy/**/* - policy-security/**/* - policy-security-ws/**/* - policy-xml/**/* - sca-api/**/* - workspace/**/* - workspace-impl/**/* - workspace-xml/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/manager/src/main/components/bin-samples.xml b/java/sca/distribution/features/manager/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..d4b13c42e0 --- /dev/null +++ b/java/sca/distribution/features/manager/src/main/components/bin-samples.xml @@ -0,0 +1,42 @@ + + + + + + + ../../../samples + samples + + domain-management/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml index a9e8b4cf3b..36508597fb 100644 --- a/java/sca/distribution/features/process/pom.xml +++ b/java/sca/distribution/features/process/pom.xml @@ -40,14 +40,6 @@ 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-distribution-webservice - jar - 1.4-SNAPSHOT - - org.apache.tuscany.sca diff --git a/java/sca/distribution/features/process/src/main/assembly/bin.xml b/java/sca/distribution/features/process/src/main/assembly/bin.xml index 068c11073e..85c8de5239 100644 --- a/java/sca/distribution/features/process/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/process/src/main/assembly/bin.xml @@ -30,79 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - helloworld-bpel/**/* - helloworld-bpel-ws/**/* - quote-xquery/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-down-dependencies.xml + src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/process/src/main/assembly/src.xml b/java/sca/distribution/features/process/src/main/assembly/src.xml index d42bcf322b..0d832271b9 100644 --- a/java/sca/distribution/features/process/src/main/assembly/src.xml +++ b/java/sca/distribution/features/process/src/main/assembly/src.xml @@ -30,106 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-sca/**/* - binding-sca-axis2/**/* - binding-sca-xml/**/* - binding-ws/**/* - binding-ws-axis2/**/* - binding-ws-wsdlgen/**/* - binding-ws-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-axiom/**/* - databinding-jaxb/**/* - databinding-jaxb-axiom/**/* - databinding-saxon/**/* - databinding-sdo/**/* - definitions/**/* - definitions-xml/**/* - distribution-core/**/* - distribution-process/**/* - distribution-webservice/**/* - endpoint/**/* - extensibility/**/* - host-embedded/**/* - host-http/**/* - host-jetty/**/* - implementation-bpel/**/* - implementation-bpel-ode/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - implementation-xquery/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - policy/**/* - policy-security/**/* - policy-security-ws/**/* - policy-xml/**/* - policy-xml-ws/**/* - sca-api/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/process/src/main/components/bin-samples.xml b/java/sca/distribution/features/process/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..8e8bc2e507 --- /dev/null +++ b/java/sca/distribution/features/process/src/main/components/bin-samples.xml @@ -0,0 +1,44 @@ + + + + + + + ../../../samples + samples + + helloworld-bpel/**/* + helloworld-bpel-ws/**/* + quote-xquery/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/process/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/web20/src/main/assembly/bin.xml b/java/sca/distribution/features/web20/src/main/assembly/bin.xml index 02747955bb..85c8de5239 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/bin.xml @@ -30,79 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - feed-aggregator/**/* - store/**/* - web-resource/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-down-dependencies.xml + src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/web20/src/main/assembly/src.xml b/java/sca/distribution/features/web20/src/main/assembly/src.xml index 1b9cfee47a..0d832271b9 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/src.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/src.xml @@ -30,105 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-atom/**/* - binding-atom-abdera/**/* - binding-http/**/* - binding-http-runtime/**/* - binding-jsonrpc/**/* - binding-jsonrpc-runtime/**/* - binding-rss/**/* - binding-rss-rome/**/* - binding-sca/**/* - binding-sca-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-resource/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-jaxb/**/* - databinding-json/**/* - definitions/**/* - definitions-xml/**/* - distribution-core/**/* - distribution-web20/**/* - endpoint/**/* - extensibility/**/* - host-embedded/**/* - host-http/**/* - host-jetty/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - implementation-resource/**/* - implementation-resource-runtime/**/* - implementation-widget/**/* - implementation-widget-runtime/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - policy/**/* - policy-security/**/* - policy-xml/**/* - sca-api/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/web20/src/main/components/bin-samples.xml b/java/sca/distribution/features/web20/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..5cc62040c0 --- /dev/null +++ b/java/sca/distribution/features/web20/src/main/components/bin-samples.xml @@ -0,0 +1,44 @@ + + + + + + + ../../../samples + samples + + feed-aggregator/**/* + store/**/* + web-resource/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/web20/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + diff --git a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml index 5d9eef6dcd..85c8de5239 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml @@ -30,85 +30,9 @@ zip - - - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/bin - - - INSTALL - LICENSE - NOTICE - - - - - - ../../sca/modules/node2-launcher-webapp/target - modules - - *.war - - - - - - ../../sca/samples - samples - - callback-ws-client/**/* - callback-ws-service/**/* - helloworld-ws-reference/**/* - helloworld-ws-service/**/* - helloworld-ws-reference-secure/**/* - helloworld-ws-service-secure/**/* - helloworld-ws-service-webapp/**/* - simple-callback-ws/**/* - zipcode-jaxws/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - - - - - - - - - modules - false - - org.apache.tuscany.sca:* - - - - - - lib - false - - org.apache.tuscany.sca:* - - - - - + + ../core/src/main/components/bin-common.xml + ../core/src/main/components/bin-down-dependencies.xml + src/main/components/bin-samples.xml + diff --git a/java/sca/distribution/features/webservice/src/main/assembly/src.xml b/java/sca/distribution/features/webservice/src/main/assembly/src.xml index 154ff4927b..0d832271b9 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/src.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/src.xml @@ -30,100 +30,8 @@ zip - - - src/main/release - - - CHANGES - DISCLAIMER - README - RELEASE_NOTES - - - - src/main/release/src - - - BUILDING - LICENSE - NOTICE - - - - - - ../../../modules - modules - - assembly/**/* - assembly-xml/**/* - assembly-xsd/**/* - binding-sca/**/* - binding-sca-axis2/**/* - binding-sca-xml/**/* - binding-ws/**/* - binding-ws-axis2/**/* - binding-ws-wsdlgen/**/* - binding-ws-xml/**/* - contribution/**/* - contribution-impl/**/* - contribution-java/**/* - contribution-namespace/**/* - contribution-xml/**/* - core/**/* - core-databinding/**/* - core-spi/**/* - data-api/**/* - databinding/**/* - databinding-axiom/**/* - databinding-jaxb/**/* - databinding-jaxb-axiom/**/* - definitions/**/* - definitions-xml/**/* - distribution-core/**/* - distribution-webservice/**/* - endpoint/**/* - extensibility/**/* - host-embedded/**/* - host-http/**/* - host-jetty/**/* - implementation-java/**/* - implementation-java-runtime/**/* - implementation-java-xml/**/* - implementation-node/**/* - implementation-node-runtime/**/* - interface/**/* - interface-java/**/* - interface-java-jaxws/**/* - interface-java-xml/**/* - interface-wsdl/**/* - interface-wsdl-xml/**/* - monitor/**/* - node2-api/**/* - node2-impl/**/* - node2-launcher/**/* - policy/**/* - policy-security/**/* - policy-security-ws/**/* - policy-xml/**/* - policy-xml-ws/**/* - sca-api/**/* - xsd/**/* - xsd-xml/**/* - - - - **/.* - **/.*/** - **/*.log - - - pom.xml - **/target - **/target/**/* - - - - + + ../core/src/main/components/src-common.xml + src/main/components/src-modules.xml + diff --git a/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml b/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..1bb5c20536 --- /dev/null +++ b/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml @@ -0,0 +1,50 @@ + + + + + + + ../../../samples + samples + + callback-ws-client/**/* + callback-ws-service/**/* + helloworld-ws-reference/**/* + helloworld-ws-service/**/* + helloworld-ws-reference-secure/**/* + helloworld-ws-service-secure/**/* + helloworld-ws-service-webapp/**/* + simple-callback-ws/**/* + zipcode-jaxws/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + 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 new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ + + + + + + + ../../../modules + modules + + assembly/**/* + assembly-xml/**/* + assembly-xsd/**/* + binding-sca/**/* + binding-sca-xml/**/* + contribution/**/* + contribution-impl/**/* + contribution-java/**/* + contribution-namespace/**/* + contribution-xml/**/* + core/**/* + core-databinding/**/* + core-spi/**/* + data-api/**/* + databinding/**/* + databinding-jaxb/**/* + definitions/**/* + definitions-xml/**/* + endpoint/**/* + extensibility/**/* + host-embedded/**/* + host-http/**/* + implementation-java/**/* + implementation-java-runtime/**/* + implementation-java-xml/**/* + implementation-node/**/* + implementation-node-runtime/**/* + interface/**/* + interface-java/**/* + interface-java-jaxws/**/* + interface-java-xml/**/* + interface-wsdl/**/* + interface-wsdl-xml/**/* + monitor/**/* + monitor-logging/**/* + node-api/**/* + node-impl/**/* + node-launcher/**/* + node-launcher-webapp/**/* + policy/**/* + policy-security/**/* + policy-xml/**/* + sca-api/**/* + xsd/**/* + xsd-xml/**/* + + + + **/.* + **/.*/** + **/*.log + + + pom.xml + **/target + **/target/**/* + + + + -- cgit v1.2.3