servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r991582 - in /servicemix/smx4/features/trunk/assembly/src/main: descriptors/unix-bin.xml descriptors/windows-bin.xml distribution/windows-text/bin/start.bat
Date Wed, 01 Sep 2010 16:04:00 GMT
Author: gertv
Date: Wed Sep  1 16:04:00 2010
New Revision: 991582

URL: http://svn.apache.org/viewvc?rev=991582&view=rev
Log:
Fix assembly - should include both bin/karaf and bin/servicemix for admin:create'd instances
to work

Removed:
    servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
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=991582&r1=991581&r2=991582&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 Wed Sep  1 16:04:00
2010
@@ -50,6 +50,9 @@
             <outputDirectory>/</outputDirectory>
             <includes>
               <include>bin/admin</include>
+              <include>bin/karaf</include>  <!-- we need this one in here
for admin:create'd instances to work -->
+              <include>bin/start</include>
+              <include>bin/stop</include>
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>

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=991582&r1=991581&r2=991582&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 Wed Sep 
1 16:04:00 2010
@@ -28,7 +28,6 @@
           <outputDirectory>/</outputDirectory>
           <excludes>
              <exclude>**/demos/**</exclude>
-             <exclude>bin/start.bat</exclude>
              <exclude>etc/system.properties</exclude>
              <exclude>etc/org.apache.karaf.features.cfg</exclude>
              <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
@@ -100,11 +99,6 @@
           <lineEnding>dos</lineEnding>
           <fileMode>0644</fileMode>
       </fileSet>
-      <fileSet>
-          <directory>src/main/distribution/windows-text</directory>
-          <outputDirectory>/</outputDirectory>
-          <lineEnding>dos</lineEnding>
-      </fileSet>
 
       <!-- Copy over jar files -->
       <fileSet>



Mime
View raw message