You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/06/23 10:10:59 UTC
svn commit: r670472 - in /servicemix/smx4/kernel/trunk/assembly: pom.xml
src/main/descriptors/unix-bin.xml src/main/descriptors/unix-src.xml
src/main/descriptors/windows-bin.xml src/main/descriptors/windows-src.xml
Author: gertv
Date: Mon Jun 23 01:10:59 2008
New Revision: 670472
URL: http://svn.apache.org/viewvc?rev=670472&view=rev
Log:
SMX4KNL-34: snapshot jar name mismatch in startup.properties and in the system folder
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=670472&r1=670471&r2=670472&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Mon Jun 23 01:10:59 2008
@@ -247,7 +247,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<id>unix-bin</id>
@@ -354,4 +353,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=670472&r1=670471&r2=670472&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Jun 23 01:10:59 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>/system</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml?rev=670472&r1=670471&r2=670472&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml Mon Jun 23 01:10:59 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/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=670472&r1=670471&r2=670472&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Jun 23 01:10:59 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>
@@ -125,14 +126,13 @@
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.config</include>
<include>org.apache.servicemix.kernel.jaas:org.apache.servicemix.kernel.jaas.keystore</include>
- <!-- GShell -->
- <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <!-- GShell -->
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
<include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.log</include>
- <!-- OBR + GShell command -->
+ <!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.ops4j.pax.url:pax-url-mvn</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml?rev=670472&r1=670471&r2=670472&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml Mon Jun 23 01:10:59 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>