tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r740728 - in /tuscany/java/sca/distribution/all: pom.xml src/main/assembly/src.xml src/main/components/src-modules.xml
Date Wed, 04 Feb 2009 13:23:08 GMT
Author: antelder
Date: Wed Feb  4 13:23:08 2009
New Revision: 740728

URL: http://svn.apache.org/viewvc?rev=740728&view=rev
Log:
TUSCANY-2814 fix loop in assembly plugin when too many duplicate includes

Modified:
    tuscany/java/sca/distribution/all/pom.xml
    tuscany/java/sca/distribution/all/src/main/assembly/src.xml
    tuscany/java/sca/distribution/all/src/main/components/src-modules.xml

Modified: tuscany/java/sca/distribution/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/pom.xml?rev=740728&r1=740727&r2=740728&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/pom.xml (original)
+++ tuscany/java/sca/distribution/all/pom.xml Wed Feb  4 13:23:08 2009
@@ -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>

Modified: tuscany/java/sca/distribution/all/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/assembly/src.xml?rev=740728&r1=740727&r2=740728&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/all/src/main/assembly/src.xml Wed Feb  4 13:23:08 2009
@@ -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>

Modified: tuscany/java/sca/distribution/all/src/main/components/src-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/all/src/main/components/src-modules.xml?rev=740728&r1=740727&r2=740728&view=diff
==============================================================================
--- tuscany/java/sca/distribution/all/src/main/components/src-modules.xml (original)
+++ tuscany/java/sca/distribution/all/src/main/components/src-modules.xml Wed Feb  4 13:23:08
2009
@@ -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>



Mime
View raw message