Author: brett
Date: Fri Feb 29 00:38:31 2008
New Revision: 632260
URL: http://svn.apache.org/viewvc?rev=632260&view=rev
Log:
[MRM-688] don't translate line endings for binaries
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty-archetype/src/main/assembly/bin.xml
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty-archetype/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty-archetype/src/main/assembly/bin.xml?rev=632260&r1=632259&r2=632260&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty-archetype/src/main/assembly/bin.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty-archetype/src/main/assembly/bin.xml
Fri Feb 29 00:38:31 2008
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<fileSets>
- <fileSet>
+ <fileSet>
<directory>target/generated-resources/appassembler/jsw/archiva/apps</directory>
<outputDirectory>apps</outputDirectory>
</fileSet>
@@ -54,40 +54,54 @@
<directory>target/generated-resources/appassembler/jsw/archiva/etc</directory>
<outputDirectory>etc</outputDirectory>
<includes>
- <include>**/jetty.xml</include>
- <include>**/jetty-logging.xml</include>
- <include>**/webdefault.xml</include>
- <include>**/realm.properties</include>
+ <include>jetty.xml</include>
+ <include>jetty-logging.xml</include>
+ <include>webdefault.xml</include>
+ <include>realm.properties</include>
</includes>
</fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>*/wrapper.conf</include>
+ <include>wrapper.conf</include>
</includes>
</fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>**/archiva</include>
- <include>**/wrapper-linux-x86-32</include>
- <include>**/wrapper-macosx-universal-32</include>
- <include>**/wrapper-solaris-x86-32</include>
+ <include>archiva</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
+
<directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>wrapper-linux-x86-32</include>
+ <include>wrapper-macosx-universal-32</include>
+ <include>wrapper-solaris-x86-32</include>
</includes>
<fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>**/*.bat</include>
- <include>**/wrapper-windows-x86-32.exe</include>
+ <include>archiva.bat</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>dos</lineEnding>
+ </fileSet>
+ <fileSet>
+
<directory>target/generated-resources/appassembler/jsw/archiva/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>wrapper-windows-x86-32.exe</include>
+ </includes>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF/</directory>
