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 2008/09/04 21:26:16 UTC
svn commit: r692200 - in /servicemix/smx4/features/trunk/assembly/src/main:
descriptors/ distribution/binary/ distribution/unix-binary/
distribution/unix-shell/ distribution/windows-binary/
distribution/windows-text/
Author: gnodet
Date: Thu Sep 4 12:26:16 2008
New Revision: 692200
URL: http://svn.apache.org/viewvc?rev=692200&view=rev
Log:
SMX4-92: servicemix does not start on windows as the startup.properties file is missing
Removed:
servicemix/smx4/features/trunk/assembly/src/main/distribution/binary/
servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-binary/
servicemix/smx4/features/trunk/assembly/src/main/distribution/unix-shell/
servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-binary/
servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=692200&r1=692199&r2=692200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Thu Sep 4 12:26:16 2008
@@ -59,37 +59,11 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/unix-text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
- <fileSet>
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/unix-binary</directory>
- <outputDirectory>/</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <!-- Copy over the files that need unix line endings and also chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/unix-shell</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <fileMode>0755</fileMode>
- </fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>../examples</directory>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=692200&r1=692199&r2=692200&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Sep 4 12:26:16 2008
@@ -26,24 +26,6 @@
<fileSet>
<directory>target/dependencies/win/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
<outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>etc/*</exclude>
- <!-- excluding these to avoid they end up twice in the resulting zip file -->
- <exclude>*.txt</exclude>
- <exclude>system/org.apache.felix.prefs-${felix.prefs.version}.jar</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/dependencies/win/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>etc/*</include>
- </includes>
- <excludes>
- <!-- excluding this to avoid they end up twice in the resulting zip file -->
- <exclude>etc/startup.properties</exclude>
- </excludes>
- <lineEnding>dos</lineEnding>
</fileSet>
<!-- Copy license and other files from root -->
@@ -64,28 +46,11 @@
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
- <directory>src/main/distribution/windows-text</directory>
- <outputDirectory>/</outputDirectory>
- <lineEnding>dos</lineEnding>
- </fileSet>
- <fileSet>
<directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- Copy over files that should not get the line endings converted -->
- <fileSet>
- <directory>src/main/distribution/binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- Copy over the files that should not get the line endings converted but need to be chmod to 755 -->
- <fileSet>
- <directory>src/main/distribution/windows-binary</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
<!-- Copy over the examples -->
<fileSet>
<directory>../examples</directory>