TUSCANY-2814 fix loop in assembly plugin when too many duplicate includes

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

3 files changed, 46 insertions, 46 deletions

diff --git a/java/sca/distribution/all/pom.xml b/java/sca/distribution/all/pom.xml
index f5c7478f12..d486e14b27 100644
--- a/java/sca/distribution/all/pom.xml
+++ b/java/sca/distribution/all/pom.xml
@@ -106,7 +106,7 @@
                                 <configuration>

                                     <descriptors>

                                         <descriptor>src/main/assembly/bin.xml</descriptor>

-                                        <!-- TUSCANY-2814 descriptor>src/main/assembly/src.xml</descriptor -->

+                                        <descriptor>src/main/assembly/src.xml</descriptor>

                                     </descriptors>

                                     <tarLongFileMode>gnu</tarLongFileMode>

                                     <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName>

diff --git a/java/sca/distribution/all/src/main/assembly/src.xml b/java/sca/distribution/all/src/main/assembly/src.xml
index 936cb2f28f..a2865a09c5 100644
--- a/java/sca/distribution/all/src/main/assembly/src.xml
+++ b/java/sca/distribution/all/src/main/assembly/src.xml
@@ -27,14 +27,14 @@
         <format>zip</format>

     </formats>

 

-    <componentDescriptors>
-        <componentDescriptor>../all/src/main/components/src-modules.xml</componentDescriptor>
+    <componentDescriptors>

+        <componentDescriptor>../all/src/main/components/src-modules.xml</componentDescriptor>

         <componentDescriptor>../all/src/main/components/src-samples.xml</componentDescriptor>

+<!--

         <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>

         <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>

-        <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>

         <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor>

-<!--

         <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor>

         <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor>

         <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor>

diff --git a/java/sca/distribution/all/src/main/components/src-modules.xml b/java/sca/distribution/all/src/main/components/src-modules.xml
index 0a85a03a7c..bcb056b840 100644
--- a/java/sca/distribution/all/src/main/components/src-modules.xml
+++ b/java/sca/distribution/all/src/main/components/src-modules.xml
@@ -1,41 +1,41 @@
-<!--
-    * 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>
-            </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>

+            </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>