Author: jbonofre
Date: Sat Apr 2 09:35:34 2011
New Revision: 1087986
URL: http://svn.apache.org/viewvc?rev=1087986&view=rev
Log:
[SMX4NMR-258] Fix assembly to include all etc and bin files.
Added:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
- copied, changed from r1087965,
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg
Removed:
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.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=1087986&r1=1087985&r2=1087986&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 Sat
Apr 2 09:35:34 2011
@@ -93,7 +93,13 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>target/classes/bin</directory>
+ <directory>src/main/distribution/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/bin</directory>
<includes>
<include>start</include>
<include>stop</include>
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=1087986&r1=1087985&r2=1087986&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 Sat
Apr 2 09:35:34 2011
@@ -93,7 +93,13 @@
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>target/classes/bin</directory>
+ <directory>src/main/distribution/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distribution/bin</directory>
<includes>
<include>start.bat</include>
<include>stop.bat</include>
Copied:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(from r1087965,
servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg)
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=servicemix/smx4/nmr/trunk/assembly/src/main/distribution/etc/org.apache.karaf.features.cfg&r1=1087965&r2=1087986&rev=1087986&view=diff
==============================================================================
(empty)
