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

4 files changed, 139 insertions, 176 deletions

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 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <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/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../../sca/modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../sca/samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>feed-aggregator/**/*</include>
-                <include>store/**/*</include>
-                <include>web-resource/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add all the Tuscany modules to the modules directory -->
-        <dependencySet>
-            <outputDirectory>modules</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:*</include>
-            </includes>
-        </dependencySet>
-
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:*</exclude>
-            </excludes>
-        </dependencySet>
-
-    </dependencySets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>
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 @@
         <format>zip</format>
     </formats>
 
-    <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>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-http-runtime/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-jsonrpc-runtime/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-rss-rome/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-json/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-web20/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>host-embedded/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-resource-runtime/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>
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 @@
+<!--
+    * 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.
+-->
+<component>
+    <fileSets>
+
+        <!-- Add samples to the samples directory -->
+        <fileSet>
+            <directory>../../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>feed-aggregator/**/*</include>
+                <include>store/**/*</include>
+                <include>web-resource/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Sample specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>
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 @@
+<!--
+    * 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.
+-->
+<component>
+    <fileSets>
+
+        <!-- Add module sources to the modules directory -->
+        <fileSet>
+            <directory>../../../modules</directory>
+            <outputDirectory>modules</outputDirectory>
+            <includes>
+                <include>assembly/**/*</include>
+                <include>assembly-xml/**/*</include>
+                <include>assembly-xsd/**/*</include>
+                <include>binding-sca/**/*</include>
+                <include>binding-sca-xml/**/*</include>
+                <include>contribution/**/*</include>
+                <include>contribution-impl/**/*</include>
+                <include>contribution-java/**/*</include>
+                <include>contribution-namespace/**/*</include>
+                <include>contribution-xml/**/*</include>
+                <include>core/**/*</include>
+                <include>core-databinding/**/*</include>
+                <include>core-spi/**/*</include>
+                <include>data-api/**/*</include>
+                <include>databinding/**/*</include>
+                <include>databinding-jaxb/**/*</include>
+                <include>definitions/**/*</include>
+                <include>definitions-xml/**/*</include>
+                <include>endpoint/**/*</include>
+                <include>extensibility/**/*</include>
+                <include>host-embedded/**/*</include>
+                <include>host-http/**/*</include>
+                <include>implementation-java/**/*</include>
+                <include>implementation-java-runtime/**/*</include>
+                <include>implementation-java-xml/**/*</include>
+                <include>implementation-node/**/*</include>
+                <include>implementation-node-runtime/**/*</include>
+                <include>interface/**/*</include>
+                <include>interface-java/**/*</include>
+                <include>interface-java-jaxws/**/*</include>
+                <include>interface-java-xml/**/*</include>
+                <include>interface-wsdl/**/*</include>
+                <include>interface-wsdl-xml/**/*</include>
+                <include>monitor/**/*</include>
+                <include>monitor-logging/**/*</include>
+                <include>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-webapp/**/*</include>
+                <include>policy/**/*</include>
+                <include>policy-security/**/*</include>
+                <include>policy-xml/**/*</include>
+                <include>sca-api/**/*</include>
+                <include>xsd/**/*</include>
+                <include>xsd-xml/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>