You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/06/24 09:48:00 UTC

svn commit: r1139187 - in /camel/trunk/apache-camel: pom.xml src/main/descriptors/src.xml src/main/descriptors/unix-src.xml src/main/descriptors/windows-src.xml

Author: ningjiang
Date: Fri Jun 24 07:47:59 2011
New Revision: 1139187

URL: http://svn.apache.org/viewvc?rev=1139187&view=rev
Log:
CAMEL-4141 Don't filter for line ending for source distributions

Added:
    camel/trunk/apache-camel/src/main/descriptors/src.xml   (with props)
Removed:
    camel/trunk/apache-camel/src/main/descriptors/unix-src.xml
    camel/trunk/apache-camel/src/main/descriptors/windows-src.xml
Modified:
    camel/trunk/apache-camel/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1139187&r1=1139186&r2=1139187&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Fri Jun 24 07:47:59 2011
@@ -568,7 +568,7 @@
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>unix-bin</id>
+                <id>bin</id>
                 <phase>package</phase>
                 <goals>
                   <goal>single</goal>
@@ -576,51 +576,26 @@
                 <configuration>
                   <descriptors>
                     <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-                  </descriptors>
-                  <finalName>${project.artifactId}-${project.version}</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
-	          <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-              </execution>
-              <execution>
-                <id>windows-bin</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
                     <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
                   </descriptors>
                   <finalName>${project.artifactId}-${project.version}</finalName>
                   <appendAssemblyId>false</appendAssemblyId>
+	          <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
               </execution>
               <execution>
-                <id>unix-src</id>
+                <id>src</id>
                 <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
                 <configuration>
                   <descriptors>
-                    <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+                    <descriptor>src/main/descriptors/src.xml</descriptor>
 	              </descriptors>
                   <tarLongFileMode>gnu</tarLongFileMode> 
                 </configuration>
               </execution>
-              <execution>
-                <id>windows-src</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/descriptors/windows-src.xml</descriptor>
-                  </descriptors>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
         </plugins>

Added: camel/trunk/apache-camel/src/main/descriptors/src.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/src.xml?rev=1139187&view=auto
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/src.xml (added)
+++ camel/trunk/apache-camel/src/main/descriptors/src.xml Fri Jun 24 07:47:59 2011
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <!-- Binary Files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <excludes>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/target/**</exclude>
+
+        <exclude>**/build/**</exclude>
+        <!-- exclude>data/**</exclude>
+        <exclude>*/data/**</exclude -->
+        <exclude>activemq-data/**</exclude>
+        <exclude>*/activemq-data/**</exclude>
+        <exclude>**/eclipse-classes/**</exclude>
+        <exclude>**/.*</exclude>
+        <exclude>**/.*/**</exclude>
+
+        <exclude>**/surefire*</exclude>
+        <exclude>**/svn-commit*</exclude>
+
+        <exclude>**/*.iml</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iws</exclude>
+
+        <exclude>**/cobertura.ser</exclude>
+      </excludes>
+    </fileSet>
+
+  </fileSets>
+</assembly>

Propchange: camel/trunk/apache-camel/src/main/descriptors/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/apache-camel/src/main/descriptors/src.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/apache-camel/src/main/descriptors/src.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml