From b2651f2ac1fa7994db12a6a1d6af8e8869883588 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Wed, 27 Aug 2008 02:37:02 +0000 Subject: Minor fixes. Renamed down-dependencies to filtered-dependencies. Removed the useTransitiveDependencies element as it causes dependencies to be incorrectly excluded. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689338 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/components/bin-down-dependencies.xml | 103 --------------------- .../main/components/bin-filtered-dependencies.xml | 101 ++++++++++++++++++++ .../features/ejava/src/main/assembly/bin.xml | 2 +- .../features/etc/generate-all-maven-files.sh | 2 +- .../features/etc/generate-down-dependencies.sh | 71 -------------- .../features/etc/generate-filtered-dependencies.sh | 69 ++++++++++++++ .../features/manager/src/main/assembly/bin.xml | 2 +- .../features/process/src/main/assembly/bin.xml | 2 +- .../features/web20/src/main/assembly/bin.xml | 2 +- .../features/webservice/src/main/assembly/bin.xml | 2 +- 10 files changed, 176 insertions(+), 180 deletions(-) delete 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-filtered-dependencies.xml delete mode 100755 java/sca/distribution/features/etc/generate-down-dependencies.sh create mode 100755 java/sca/distribution/features/etc/generate-filtered-dependencies.sh (limited to 'java/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 deleted file mode 100644 index 1bcab2a9e3..0000000000 --- a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - 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 - - - - - - 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-filtered-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml new file mode 100644 index 0000000000..ecacf1d9f5 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml @@ -0,0 +1,101 @@ + + + + + + + modules + false + + 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 + + + + + + lib + false + + 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/ejava/src/main/assembly/bin.xml b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml index 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ ../core/src/main/components/bin-common.xml - ../core/src/main/components/bin-down-dependencies.xml + ../core/src/main/components/bin-filtered-dependencies.xml src/main/components/bin-samples.xml diff --git a/java/sca/distribution/features/etc/generate-all-maven-files.sh b/java/sca/distribution/features/etc/generate-all-maven-files.sh index d80368b90c..4619c7f539 100755 --- a/java/sca/distribution/features/etc/generate-all-maven-files.sh +++ b/java/sca/distribution/features/etc/generate-all-maven-files.sh @@ -19,7 +19,7 @@ # for all the distributions echo "Generate Maven files: core" -cd core; ../etc/generate-down-dependencies.sh > src/main/components/bin-down-dependencies.xml; ../etc/generate-maven-files.sh +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 diff --git a/java/sca/distribution/features/etc/generate-down-dependencies.sh b/java/sca/distribution/features/etc/generate-down-dependencies.sh deleted file mode 100755 index d8ad5b75f3..0000000000 --- a/java/sca/distribution/features/etc/generate-down-dependencies.sh +++ /dev/null @@ -1,71 +0,0 @@ -# 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 "" - diff --git a/java/sca/distribution/features/etc/generate-filtered-dependencies.sh b/java/sca/distribution/features/etc/generate-filtered-dependencies.sh new file mode 100755 index 0000000000..7a04369b50 --- /dev/null +++ b/java/sca/distribution/features/etc/generate-filtered-dependencies.sh @@ -0,0 +1,69 @@ +# 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 " " +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 " " + +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 "" + 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 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ ../core/src/main/components/bin-common.xml - ../core/src/main/components/bin-down-dependencies.xml + ../core/src/main/components/bin-filtered-dependencies.xml src/main/components/bin-samples.xml 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 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/process/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/process/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ ../core/src/main/components/bin-common.xml - ../core/src/main/components/bin-down-dependencies.xml + ../core/src/main/components/bin-filtered-dependencies.xml src/main/components/bin-samples.xml 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 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ ../core/src/main/components/bin-common.xml - ../core/src/main/components/bin-down-dependencies.xml + ../core/src/main/components/bin-filtered-dependencies.xml src/main/components/bin-samples.xml 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 85c8de5239..fd49912e91 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml @@ -32,7 +32,7 @@ ../core/src/main/components/bin-common.xml - ../core/src/main/components/bin-down-dependencies.xml + ../core/src/main/components/bin-filtered-dependencies.xml src/main/components/bin-samples.xml -- cgit v1.2.3