Simplified and cleaned up the distro builds a bit. Moved script to etc directory.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@685723 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 79 insertions, 21 deletions

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 92734897e7..1b9cfee47a 100644
--- a/java/sca/distribution/features/web20/src/main/assembly/src.xml
+++ b/java/sca/distribution/features/web20/src/main/assembly/src.xml
@@ -30,27 +30,6 @@
         <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>
@@ -71,6 +50,85 @@
                 <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>
 
 </assembly>