servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r670482 - in /servicemix/smx4/nmr/trunk: assembly/ assembly/src/main/descriptors/ bundle/ bundles/woodstox/ document/ jbi/api/ jbi/commands/ jbi/deployer/ jbi/itests/ jbi/management/ jbi/osgi/ jbi/runtime/ nmr/api/ nmr/commands/ nmr/core/ n...
Date Mon, 23 Jun 2008 08:47:58 GMT
Author: gertv
Date: Mon Jun 23 01:47:57 2008
New Revision: 670482

URL: http://svn.apache.org/viewvc?rev=670482&view=rev
Log:
SMX4NMR-31: Improve NMR assembly creation process

Modified:
    servicemix/smx4/nmr/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml
    servicemix/smx4/nmr/trunk/bundle/   (props changed)
    servicemix/smx4/nmr/trunk/bundles/woodstox/   (props changed)
    servicemix/smx4/nmr/trunk/document/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/api/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/commands/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/deployer/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/itests/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/management/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/osgi/   (props changed)
    servicemix/smx4/nmr/trunk/jbi/runtime/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/api/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/commands/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/core/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/management/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/osgi/   (props changed)
    servicemix/smx4/nmr/trunk/nmr/spring/   (props changed)

Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=670482&r1=670481&r2=670482&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Mon Jun 23 01:47:57 2008
@@ -184,7 +184,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.1</version>
                 <executions>
                     <execution>
                         <id>unix-bin</id>

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=670482&r1=670481&r2=670482&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 Mon Jun 23 01:47:57
2008
@@ -84,14 +84,14 @@
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
     </files>
@@ -101,6 +101,7 @@
         <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/lib/</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml?rev=670482&r1=670481&r2=670482&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml Mon Jun 23 01:47:57
2008
@@ -23,7 +23,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING.txt</include>
@@ -35,7 +35,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -62,7 +62,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>
@@ -109,14 +109,14 @@
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
     </files>

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=670482&r1=670481&r2=670482&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 Mon Jun 23 01:47:57
2008
@@ -76,14 +76,14 @@
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
     </files>
@@ -93,6 +93,7 @@
         <!-- Mandatory bundles for everything -->
         <dependencySet>
             <outputDirectory>/system</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>

Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml?rev=670482&r1=670481&r2=670482&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml Mon Jun 23 01:47:57
2008
@@ -23,7 +23,7 @@
     <fileSets>
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>BUILDING.txt</include>
@@ -35,7 +35,7 @@
 
         <!-- Binary Files -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*.jpeg</include>
@@ -62,7 +62,7 @@
 
         <!-- Text Files -->
         <fileSet>
-            <directory>..</directory>
+            <directory>${basedir}/..</directory>
             <outputDirectory>src</outputDirectory>
             <includes>
                 <include>**/*</include>
@@ -110,14 +110,14 @@
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
             <outputDirectory>/</outputDirectory>
             <destName>LICENSE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
         <file>
             <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
             <outputDirectory>/</outputDirectory>
             <destName>NOTICE.txt</destName>
-            <fileMode>420</fileMode> <!-- See http://jira.codehaus.org/browse/MASSEMBLY-173
-->
+            <fileMode>0644</fileMode>
             <lineEnding>unix</lineEnding>
         </file>
     </files>

Propchange: servicemix/smx4/nmr/trunk/bundle/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/bundles/woodstox/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/document/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 .classpath
 .project

Propchange: servicemix/smx4/nmr/trunk/jbi/commands/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/deployer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/itests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/management/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/jbi/runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/commands/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/management/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr

Propchange: servicemix/smx4/nmr/trunk/nmr/spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 23 01:47:57 2008
@@ -1,3 +1,4 @@
+eclipse-classes
 target
 *.iml
 *.ipr



Mime
View raw message