You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/09/07 09:00:37 UTC
svn commit: r812013 -
/servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml
Author: gnodet
Date: Mon Sep 7 07:00:37 2009
New Revision: 812013
URL: http://svn.apache.org/viewvc?rev=812013&view=rev
Log:
Backport rev 809795: [SMX4NMR-141]NMR windows assembly incorrectly packaging the unix scripts
Modified:
servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml?rev=812013&r1=812012&r2=812013&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml Mon Sep 7 07:00:37 2009
@@ -26,7 +26,7 @@
<!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -42,7 +42,7 @@
<!-- Copy over bin/karaf separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
+ <directory>${basedir}/target/dependencies/win/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
@@ -61,7 +61,7 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over everything that needs to get unix line endings -->
+ <!-- Copy over everything that needs to get dos line endings -->
<fileSet>
<directory>${basedir}/src/main/distribution/ant</directory>
<outputDirectory>/ant</outputDirectory>