geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r894400 - in /geronimo/server/trunk/framework/configs/karaf-framework: pom.xml src/main/descriptors/geronimo-bin.xml
Date Tue, 29 Dec 2009 14:44:41 GMT
Author: genspring
Date: Tue Dec 29 14:44:41 2009
New Revision: 894400

URL: http://svn.apache.org/viewvc?rev=894400&view=rev
Log:
Define our own assembly descriptor and add windows scripts to KARAF_HOME/bin

Added:
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
      - copied, changed from r894295, geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml
Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=894400&r1=894399&r2=894400&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Tue Dec 29 14:44:41 2009
@@ -742,7 +742,7 @@
                             <outputDirectory>${project.build.directory}</outputDirectory>
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
-                                <descriptor>${project.basedir}/src/main/descriptors/unix-bin.xml</descriptor>
+                                <descriptor>${project.basedir}/src/main/descriptors/geronimo-bin.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

Copied: geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
(from r894295, geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml?p2=geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml&p1=geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml&r1=894295&r2=894400&rev=894400&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/unix-bin.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
Tue Dec 29 14:44:41 2009
@@ -97,6 +97,13 @@
             <lineEnding>unix</lineEnding>
             <fileMode>0755</fileMode>
         </fileSet>
+        
+         <!-- Copy over the files that need windows line endings -->
+         <fileSet>
+             <directory>src/main/distribution/windows-text</directory>
+             <outputDirectory>contents/</outputDirectory>
+             <lineEnding>dos</lineEnding>
+         </fileSet> 
 
         <!-- Copy over jar files -->
         <fileSet>



Mime
View raw message