Adjust the distro to align with the maven dependencies

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

2 files changed, 131 insertions, 146 deletions

diff --git a/java/sca/distribution/core/pom.xml b/java/sca/distribution/core/pom.xml
index 988cc3117d..608d5cf7ef 100644
--- a/java/sca/distribution/core/pom.xml
+++ b/java/sca/distribution/core/pom.xml
@@ -313,58 +313,51 @@
         <profile>

             <id>modules</id>

             <modules>

-                <module>../../../modules/assembly</module>

-                <module>../../../modules/assembly-xml</module>

-                <module>../../../modules/assembly-xsd</module>

-                <module>../../../modules/binding-corba</module>

-                <module>../../../modules/binding-corba-runtime</module>

-                <module>../../../modules/binding-sca</module>

-                <module>../../../modules/binding-sca-xml</module>

-                <module>../../../modules/contribution</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/extensibility-equinox</module>

-                <module>../../../modules/host-corba</module>

-                <module>../../../modules/host-corba-jse</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/node-api</module>

-                <module>../../../modules/node-impl</module>

-                <module>../../../modules/node-launcher</module>

-                <module>../../../modules/node-launcher-equinox</module>

-                <module>../../../modules/node-launcher-webapp</module>

-                <module>../../../modules/policy</module>

-                <module>../../../modules/policy-security</module>

-                <module>../../../modules/policy-security-jsr250</module>

-                <module>../../../modules/policy-xml</module>

-                <module>../../../modules/sca-api</module>

-                <module>../../../modules/workspace</module>

-                <module>../../../modules/workspace-impl</module>

-                <module>../../../modules/workspace-xml</module>

-                <module>../../../modules/xsd</module>

-                <module>../../../modules/xsd-xml</module>

+                <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-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/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/extensibility-equinox</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/node-api</module>

+                <module>../../modules/node-impl</module>

+                <module>../../modules/node-launcher</module>

+                <module>../../modules/node-launcher-equinox</module>

+                <module>../../modules/policy</module>

+                <module>../../modules/policy-security</module>

+                <module>../../modules/policy-xml</module>

+                <module>../../modules/sca-api</module>

+                <module>../../modules/workspace</module>

+                <module>../../modules/workspace-impl</module>

+                <module>../../modules/workspace-xml</module>

+                <module>../../modules/xsd</module>

+                <module>../../modules/xsd-xml</module>

             </modules>

         </profile>

     </profiles>

diff --git a/java/sca/distribution/core/src/main/components/src-modules.xml b/java/sca/distribution/core/src/main/components/src-modules.xml
index 02b7f2ff86..edf73ec8fc 100644
--- a/java/sca/distribution/core/src/main/components/src-modules.xml
+++ b/java/sca/distribution/core/src/main/components/src-modules.xml
@@ -1,94 +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-corba/**/*</include>

-                <include>binding-corba-runtime/**/*</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>extensibility-equinox/**/*</include>

-                <include>host-corba/**/*</include>

-                <include>host-corba-jse/**/*</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>node-api/**/*</include>

-                <include>node-impl/**/*</include>

-                <include>node-launcher/**/*</include>

-                <include>node-launcher-equinox/**/*</include>

-                <include>node-launcher-webapp/**/*</include>

-                <include>policy/**/*</include>

-                <include>policy-security/**/*</include>

-                <include>policy-security-jsr250/**/*</include>

-                <include>policy-xml/**/*</include>

-                <include>sca-api/**/*</include>

-                <include>workspace/**/*</include>

-                <include>workspace-impl/**/*</include>

-                <include>workspace-xml/**/*</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>

+<!--
+    * 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-java/**/*</include>
+                <include>contribution-namespace/**/*</include>
+                <include>contribution-xml/**/*</include>
+                <include>core/**/*</include>
+                <include>core-databinding/**/*</include>
+                <include>core-spi/**/*</include>
+                <include>databinding/**/*</include>
+                <include>databinding-jaxb/**/*</include>
+                <include>definitions/**/*</include>
+                <include>definitions-xml/**/*</include>
+                <include>endpoint/**/*</include>
+                <include>extensibility/**/*</include>
+                <include>extensibility-equinox/**/*</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>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-equinox/**/*</include>
+                <include>policy/**/*</include>
+                <include>policy-security/**/*</include>
+                <include>policy-xml/**/*</include>
+                <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</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>