You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/10/04 17:41:54 UTC
svn commit: r1004293 - in /servicemix/smx4/nmr/trunk:
assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml
assembly/src/main/distribution/ant/README
assembly/src/main/distribution/ant/README.txt pom.xml
Author: jbonofre
Date: Mon Oct 4 15:41:54 2010
New Revision: 1004293
URL: http://svn.apache.org/viewvc?rev=1004293&view=rev
Log:
[SMX4-572] Downgrade the maven-assembly-plugin version to avoid .formatted files. Correct bin files include/exclude.
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README (contents, props changed)
- copied, changed from r1004146, servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README.txt
Removed:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README.txt
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1004293&r1=1004292&r2=1004293&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Oct 4 15:41:54 2010
@@ -26,10 +26,11 @@
<!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>demos/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>**/demos/**</exclude>
<exclude>etc/org.apache.karaf.features.cfg</exclude>
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/custom.properties</exclude>
@@ -42,15 +43,25 @@
</excludes>
</fileSet>
- <!-- Copy over bin/* separately to get the correct file mode -->
+ <!-- Copy over bin/admin, bin/client and bin/shell scripts separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*</include>
- </includes>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}/bin/</directory>
+ <excludes>
+ <exclude>karaf</exclude>
+ <exclude>start</exclude>
+ <exclude>stop</exclude>
+ </excludes>
+ <outputDirectory>/bin/</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
+
+ <!-- Copy over ant files -->
+ <fileSet>
+ <directory>src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
<!-- Copy license and other files from root -->
<fileSet>
@@ -61,33 +72,40 @@
<include>RELEASE*</include>
</includes>
<lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
-
- <!-- Copy over everything that needs to get unix line endings -->
+
+ <!-- Copy over jar files -->
<fileSet>
- <directory>${basedir}/src/main/distribution/ant</directory>
- <outputDirectory>/ant</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
+ <directory>target/dependencies</directory>
+ <includes>
+ <include>nmr-version.jar</include>
+ </includes>
+ <outputDirectory>/lib/</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over everything that needs to get unix line endings -->
<fileSet>
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
-
<fileSet>
- <directory>${basedir}/target/features-repo</directory>
- <outputDirectory>system</outputDirectory>
+ <directory>target/classes/bin</directory>
+ <includes>
+ <include>start</include>
+ <include>stop</include>
+ </includes>
+ <outputDirectory>/bin/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
</fileSet>
- <!-- Copy over jar files -->
<fileSet>
- <directory>target/dependencies</directory>
- <includes>
- <include>nmr-version.jar</include>
- </includes>
- <outputDirectory>/lib/</outputDirectory>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
</fileSet>
<!-- Copy over the examples -->
@@ -111,11 +129,6 @@
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${basedir}/target/dependencies/nmr-version.jar</source>
- <outputDirectory>/lib/</outputDirectory>
- <fileMode>0644</fileMode>
- </file>
- <file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1004293&r1=1004292&r2=1004293&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Oct 4 15:41:54 2010
@@ -29,7 +29,8 @@
<directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>demos/**</exclude>
+ <exclude>bin/**</exclude>
+ <exclude>**/demos/**</exclude>
<exclude>etc/org.apache.karaf.features.cfg</exclude>
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>etc/custom.properties</exclude>
@@ -42,14 +43,24 @@
</excludes>
</fileSet>
- <!-- Copy over bin/admin.bat separately to get the correct file mode -->
+ <!-- Copy over bin/admin.bat, bin/client.bat and bin/shell.bat separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*.bat</include>
- </includes>
- <fileMode>0755</fileMode>
+ <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/</directory>
+ <excludes>
+ <exclude>karaf.bat</exclude>
+ <exclude>start.bat</exclude>
+ <exclude>stop.bat</exclude>
+ </excludes>
+ <outputDirectory>/bin/</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- Copy over ant files -->
+ <fileSet>
+ <directory>${basedir}/src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
<!-- Copy license and other files from root -->
@@ -61,33 +72,40 @@
<include>RELEASE*</include>
</includes>
<lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
- <!-- Copy over everything that needs to get dos line endings -->
+ <!-- Copy over jar files -->
<fileSet>
- <directory>${basedir}/src/main/distribution/ant</directory>
- <outputDirectory>/ant</outputDirectory>
- <lineEnding>dos</lineEnding>
+ <directory>target/dependencies</directory>
+ <includes>
+ <include>nmr-version.jar</include>
+ </includes>
+ <outputDirectory>/lib/</outputDirectory>
+ <fileMode>0644</fileMode>
</fileSet>
+ <!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
-
<fileSet>
- <directory>${basedir}/target/features-repo</directory>
- <outputDirectory>system</outputDirectory>
+ <directory>target/classes/bin</directory>
+ <includes>
+ <include>start.bat</include>
+ <include>stop.bat</include>
+ </includes>
+ <outputDirectory>/bin/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
</fileSet>
- <!-- Copy over jar files -->
<fileSet>
- <directory>target/dependencies</directory>
- <includes>
- <include>nmr-version.jar</include>
- </includes>
- <outputDirectory>/lib/</outputDirectory>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
</fileSet>
<!-- Copy over the examples -->
@@ -107,13 +125,8 @@
<source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
<outputDirectory>/bin/</outputDirectory>
<destName>nmr.bat</destName>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>${basedir}/target/dependencies/nmr-version.jar</source>
- <outputDirectory>/lib/</outputDirectory>
<fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
</file>
<file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
Copied: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README (from r1004146, servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README?p2=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README&p1=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README.txt&r1=1004146&r2=1004293&rev=1004293&view=diff
==============================================================================
(empty)
Propchange: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/smx4/nmr/trunk/assembly/src/main/distribution/ant/README
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1004293&r1=1004292&r2=1004293&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Oct 4 15:41:54 2010
@@ -133,6 +133,11 @@
<!-- Maven Plugins -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
+ <!--
+ Fix the assembly plugin version to avoid:
+ http://jira.codehaus.org/browse/MASSEMBLY-462
+ -->
+ <maven-assembly-plugin.version>2.2-beta-4</maven-assembly-plugin.version>
</properties>
@@ -740,6 +745,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>