servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1003171 - in /servicemix/smx4/nmr/trunk: .gitignore assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml
Date Thu, 30 Sep 2010 17:10:58 GMT
Author: gertv
Date: Thu Sep 30 17:10:58 2010
New Revision: 1003171

URL: http://svn.apache.org/viewvc?rev=1003171&view=rev
Log:
Fix assembly: add the karaf, client and shell script to the kits again

Added:
    servicemix/smx4/nmr/trunk/.gitignore
Modified:
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml

Added: servicemix/smx4/nmr/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/.gitignore?rev=1003171&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/.gitignore (added)
+++ servicemix/smx4/nmr/trunk/.gitignore Thu Sep 30 17:10:58 2010
@@ -0,0 +1,5 @@
+.settings
+.classpath
+.project
+*.i??
+target
\ No newline at end of file

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=1003171&r1=1003170&r2=1003171&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 Thu Sep 30 17:10:58
2010
@@ -29,7 +29,6 @@
             <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
-              <exclude>bin/**</exclude>
               <exclude>demos/**</exclude>
               <exclude>etc/org.apache.karaf.features.cfg</exclude>
               <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
@@ -48,7 +47,7 @@
             <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
-              <include>bin/admin</include>
+              <include>bin/*</include>
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -112,20 +111,6 @@
             <lineEnding>unix</lineEnding>
         </file>
         <file>
-            <source>${basedir}/target/classes/bin/start</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>start</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/bin/stop</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>stop</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </file>
-        <file>
             <source>${basedir}/target/dependencies/nmr-version.jar</source>
             <outputDirectory>/lib/</outputDirectory>
             <fileMode>0644</fileMode>

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=1003171&r1=1003170&r2=1003171&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 Thu Sep 30 17:10:58
2010
@@ -29,7 +29,6 @@
             <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
-              <exclude>bin/**</exclude>
               <exclude>demos/**</exclude>
               <exclude>etc/org.apache.karaf.features.cfg</exclude>
               <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
@@ -48,7 +47,7 @@
             <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
-              <include>bin/admin.bat</include>
+              <include>bin/*.bat</include>
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>
@@ -112,20 +111,6 @@
             <lineEnding>dos</lineEnding>
         </file>
         <file>
-            <source>${basedir}/target/classes/bin/start.bat</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>start.bat</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
-            <source>${basedir}/target/classes/bin/stop.bat</source>
-            <outputDirectory>/bin/</outputDirectory>
-            <destName>stop.bat</destName>
-            <fileMode>0755</fileMode>
-            <lineEnding>dos</lineEnding>
-        </file>
-        <file>
             <source>${basedir}/target/dependencies/nmr-version.jar</source>
             <outputDirectory>/lib/</outputDirectory>
             <fileMode>0644</fileMode>



Mime
View raw message