You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2014/02/27 09:10:42 UTC
svn commit: r1572464 - in /servicemix/smx5/trunk: ./ assemblies/
assemblies/src/main/descriptors/ assemblies/src/main/resources/ itests/
itests/src/test/scala/org/apache/servicemix/itests/
Author: ffang
Date: Thu Feb 27 08:10:41 2014
New Revision: 1572464
URL: http://svn.apache.org/r1572464
Log:
[SM-2233]Single assembly for Windows and other OS's
Removed:
servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml
servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-src.xml
servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml
Modified:
servicemix/smx5/trunk/assemblies/pom.xml
servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml
servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-src.xml
servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml
servicemix/smx5/trunk/itests/pom.xml
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/pom.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/pom.xml Thu Feb 27 08:10:41 2014
@@ -282,7 +282,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>${maven-assembly-plugin.version}</version>
<executions>
<execution>
<id>unix-bin</id>
@@ -299,20 +298,6 @@
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
- <execution>
- <id>windows-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
- </descriptors>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
@@ -342,19 +327,6 @@
</configuration>
<inherited>false</inherited>
</execution>
- <execution>
- <id>windows-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/windows-src.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </execution>
</executions>
</plugin>
</plugins>
Modified: servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml Thu Feb 27 08:10:41 2014
@@ -19,7 +19,7 @@
<id>apache-servicemix</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
<componentDescriptors>
Modified: servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-src.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-src.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-src.xml Thu Feb 27 08:10:41 2014
@@ -18,7 +18,7 @@
<assembly>
<id>src</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
<fileSets>
<!-- Copy license and other files from root -->
Modified: servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml Thu Feb 27 08:10:41 2014
@@ -40,6 +40,8 @@
<exclude>RELEASE-NOTES</exclude>
<exclude>karaf-manual*</exclude>
</excludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0775</directoryMode>
</fileSet>
<!-- Copy over bin/* scripts separately to get the correct file mode -->
@@ -49,6 +51,16 @@
<includes>
<include>bin/*</include>
</includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>target/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
<fileMode>0755</fileMode>
</fileSet>
@@ -70,6 +82,7 @@
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
+ <directoryMode>0775</directoryMode>
</fileSet>
<fileSet>
@@ -77,6 +90,7 @@
<outputDirectory>/licenses/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
+ <directoryMode>0775</directoryMode>
</fileSet>
<!-- Copy over filtered resources -->
@@ -88,6 +102,7 @@
</includes>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
+ <directoryMode>0775</directoryMode>
</fileSet>
</fileSets>
@@ -100,6 +115,13 @@
<lineEnding>unix</lineEnding>
</file>
<file>
+ <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix.bat</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
<source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
<outputDirectory>/</outputDirectory>
<destName>LICENSE</destName>
Modified: servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml Thu Feb 27 08:10:41 2014
@@ -26,7 +26,7 @@
<!-- Copy over the examples -->
<fileSet>
- <directory>${basedir}/../../examples</directory>
+ <directory>${basedir}/../examples</directory>
<outputDirectory>/examples/</outputDirectory>
<lineEnding>unix</lineEnding>
<includes>
@@ -50,7 +50,7 @@
</fileSet>
<fileSet>
- <directory>${basedir}/../../examples</directory>
+ <directory>${basedir}/../examples</directory>
<outputDirectory>/examples/</outputDirectory>
<lineEnding>unix</lineEnding>
<filtered>true</filtered>
Modified: servicemix/smx5/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/pom.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/pom.xml Thu Feb 27 08:10:41 2014
@@ -99,7 +99,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>apache-servicemix</artifactId>
<version>${project.version}</version>
- <type>tar.gz</type>
+ <type>zip</type>
<exclusions>
<exclusion>
<groupId>org.apache.karaf</groupId>
Modified: servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala (original)
+++ servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala Thu Feb 27 08:10:41 2014
@@ -50,7 +50,7 @@ trait IntegrationTestConfigurations {
Array(
karafDistributionConfiguration().
frameworkUrl(
- maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("tar.gz").versionAsInProject()).
+ maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()).
karafVersion("2.3.4").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1572464&r1=1572463&r2=1572464&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Thu Feb 27 08:10:41 2014
@@ -209,7 +209,7 @@
<!-- Maven Plugins -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
<maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
- <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
+ <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
<!-- Other Dependencies -->