diff options
22 files changed, 733 insertions, 71 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml index a54993b883..07a1b37731 100644 --- a/java/sca/distribution/features/all/pom.xml +++ b/java/sca/distribution/features/all/pom.xml @@ -71,6 +71,15 @@ </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -86,6 +95,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName> 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 2e80fff2f2..522d5089bf 100644 --- a/java/sca/distribution/features/all/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/all/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <!-- Base samples --> @@ -113,6 +113,7 @@ <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -125,19 +126,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/all/src/main/assembly/src.xml b/java/sca/distribution/features/all/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/all/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index a9eb0ae01c..9e42f75717 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -28,7 +28,7 @@ <artifactId>tuscany-distribution-core</artifactId> <name>Apache Tuscany SCA Core Distribution</name> - <packaging>jar</packaging> + <packaging>pom</packaging> <dependencies> @@ -201,6 +201,58 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</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-jaxb</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</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/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/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</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> + <build> <plugins> <plugin> @@ -216,6 +268,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName> 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 cc345b899b..81ae794b5d 100644 --- a/java/sca/distribution/features/core/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/core/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>calculator/**/*</include> <include>binding-echo/**/*</include> @@ -81,6 +81,7 @@ </includes> <excludes> <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> @@ -94,19 +95,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/distribution/features/core/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/core/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml index 26024cdc45..436e39cb32 100644 --- a/java/sca/distribution/features/ejava/pom.xml +++ b/java/sca/distribution/features/ejava/pom.xml @@ -72,6 +72,15 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -87,6 +96,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName> 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 6dd5c2f04e..003f8891f4 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>helloworld-reference-jms/**/*</include> <include>helloworld-service-jms/**/*</include> @@ -73,6 +73,7 @@ <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -85,19 +86,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/ejava/src/main/assembly/src.xml b/java/sca/distribution/features/ejava/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/ejava/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/generate-profile.sh b/java/sca/distribution/features/generate-profile.sh new file mode 100755 index 0000000000..1d847a164e --- /dev/null +++ b/java/sca/distribution/features/generate-profile.sh @@ -0,0 +1,31 @@ +# 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. + +# 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 + +echo " <profile>" +echo " <id>distribution</id>" +echo " <modules>" + +unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }' + +echo " </modules>" +echo " </profile>" +echo "" + diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index bbb816cf92..07c8e28c37 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -139,6 +139,15 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -154,6 +163,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName> 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 05f7746903..7d31d34935 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,13 +64,14 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>domain-management/**/*</include> </includes> <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -83,19 +84,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/manager/src/main/assembly/src.xml b/java/sca/distribution/features/manager/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/manager/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml index 9f5eba2d4f..c69155d8d9 100644 --- a/java/sca/distribution/features/process/pom.xml +++ b/java/sca/distribution/features/process/pom.xml @@ -61,6 +61,15 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -76,6 +85,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName> 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 0479fe5da4..fbf63725f6 100644 --- a/java/sca/distribution/features/process/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/process/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>helloworld-bpel/**/*</include> <include>helloworld-bpel-ws/**/*</include> @@ -73,6 +73,7 @@ <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -85,19 +86,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/process/src/main/assembly/src.xml b/java/sca/distribution/features/process/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/process/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml index c95cc79cb7..67f8685fe2 100644 --- a/java/sca/distribution/features/web20/pom.xml +++ b/java/sca/distribution/features/web20/pom.xml @@ -96,6 +96,15 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -111,6 +120,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName> 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 4da2eb131f..65b088c425 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>feed-aggregator/**/*</include> <include>store/**/*</include> @@ -73,6 +73,7 @@ <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -85,19 +86,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/web20/src/main/assembly/src.xml b/java/sca/distribution/features/web20/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/web20/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml index 79cc115477..63c99558ad 100644 --- a/java/sca/distribution/features/webservice/pom.xml +++ b/java/sca/distribution/features/webservice/pom.xml @@ -110,6 +110,15 @@ </dependency> </dependencies> + <profiles> + <!-- Profile to use to build distributions --> + <profile> + <id>distribution</id> + <modules> + </modules> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -125,6 +134,7 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <tarLongFileMode>gnu</tarLongFileMode> <finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName> 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 169a304494..f236ee1095 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/bin.xml @@ -20,7 +20,7 @@ <assembly> <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> <id></id> - <includeBaseDirectory>false</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> <formats> <!-- <format>dir</format> @@ -34,7 +34,7 @@ <!-- Add the text files to the top-level directroy --> <fileSet> <directory>src/main/release</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>CHANGES</include> <include>DISCLAIMER</include> @@ -44,7 +44,7 @@ </fileSet> <fileSet> <directory>src/main/release/bin</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT</outputDirectory> + <outputDirectory></outputDirectory> <includes> <include>INSTALL</include> <include>LICENSE</include> @@ -55,7 +55,7 @@ <!-- Add the node launcher webapp to the modules directory --> <fileSet> <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <includes> <include>*.war</include> </includes> @@ -64,7 +64,7 @@ <!-- Add samples to the samples directory --> <fileSet> <directory>../../sca/samples</directory> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/samples</outputDirectory> + <outputDirectory>samples</outputDirectory> <includes> <include>callback-ws-client/**/*</include> <include>callback-ws-service/**/*</include> @@ -79,6 +79,7 @@ <excludes> <!-- General file/folders to exclude --> <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> <exclude>**/*.log</exclude> <!-- Sample specific files/folders to exclude --> @@ -91,19 +92,16 @@ <!-- Add all the Tuscany modules to the modules directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/modules</outputDirectory> + <outputDirectory>modules</outputDirectory> <unpack>false</unpack> <includes> <include>org.apache.tuscany.sca:*</include> </includes> - <excludes> - <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude> - </excludes> </dependencySet> <!-- Add all the dependent jars to the lib directory --> <dependencySet> - <outputDirectory>tuscany-sca-1.4-SNAPSHOT/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <unpack>false</unpack> <excludes> <exclude>org.apache.tuscany.sca:*</exclude> diff --git a/java/sca/distribution/features/webservice/src/main/assembly/src.xml b/java/sca/distribution/features/webservice/src/main/assembly/src.xml new file mode 100644 index 0000000000..92734897e7 --- /dev/null +++ b/java/sca/distribution/features/webservice/src/main/assembly/src.xml @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<assembly> + <!-- id typically identifies the "type" (src vs bin etc) of the assembly --> + <id>src</id> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory> + <formats> + <!-- + <format>dir</format> + <format>tar.gz</format> + --> + <format>zip</format> + </formats> + + <moduleSets> + <moduleSet> + <sources> + <includeModuleDirectory>true</includeModuleDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </sources> + </moduleSet> + </moduleSets> + + <fileSets> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory></outputDirectory> + <includes> + <include>CHANGES</include> + <include>DISCLAIMER</include> + <include>README</include> + <include>RELEASE_NOTES</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/release/src</directory> + <outputDirectory></outputDirectory> + <includes> + <include>BUILDING</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </fileSet> + </fileSets> + +</assembly> |