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/24 05:21:19 UTC
svn commit: r1571134 - in /servicemix/smx5/trunk/assemblies: ./
apache-servicemix/ shared/ src/ src/main/appended-resource/
src/main/descriptors/ src/main/distribution/ src/main/filtered-resources/
src/main/filtered-resources/etc/ src/main/resources/
Author: ffang
Date: Mon Feb 24 04:21:18 2014
New Revision: 1571134
URL: http://svn.apache.org/r1571134
Log:
[SM-2246]Merge apache-servicemix and shared into a single assembly module
Added:
servicemix/smx5/trunk/assemblies/src/
- copied from r1571124, servicemix/smx5/trunk/assemblies/shared/src/
servicemix/smx5/trunk/assemblies/src/main/appended-resource/
- copied from r1571124, servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/appended-resources/
servicemix/smx5/trunk/assemblies/src/main/descriptors/
- copied from r1571124, servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/descriptors/
servicemix/smx5/trunk/assemblies/src/main/distribution/
- copied from r1571124, servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/distribution/
servicemix/smx5/trunk/assemblies/src/main/filtered-resources/etc/
- copied from r1571124, servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/
servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml
- copied unchanged from r1571124, servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Removed:
servicemix/smx5/trunk/assemblies/apache-servicemix/
servicemix/smx5/trunk/assemblies/shared/
Modified:
servicemix/smx5/trunk/assemblies/pom.xml
servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml
servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/common-unix-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/examples-unix-bin.xml
servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml
Modified: servicemix/smx5/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/pom.xml?rev=1571134&r1=1571133&r2=1571134&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/pom.xml (original)
+++ servicemix/smx5/trunk/assemblies/pom.xml Mon Feb 24 04:21:18 2014
@@ -28,7 +28,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <artifactId>assemblies</artifactId>
+ <artifactId>apache-servicemix</artifactId>
<packaging>pom</packaging>
<name>Apache ServiceMix :: Assemblies</name>
@@ -36,10 +36,331 @@
<examples.directory>../examples</examples.directory>
</properties>
- <modules>
- <module>shared</module>
- <module>apache-servicemix</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activator</artifactId>
+ </dependency>
+
+
+ <!-- Download Karaf assemblies for dependency:unpack-->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ </dependency>
+
+ <!--Xerces jar to be included in lib/endorsed -->
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+
+ <!--xalan jar to be included in lib/endorsed-->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ </dependency>
+
+ <!-- branding -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.branding</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <!-- we need unfiltered copies of these files -->
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <appendedResourcesDirectory>${basedir}/target/shared/appended-resources</appendedResourcesDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+ <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+ </descriptors>
+ <features>
+ <feature>cxf</feature>
+ <feature>obr</feature>
+ <feature>config</feature>
+ <feature>activemq</feature>
+ <feature>camel</feature>
+ <feature>camel-cxf</feature>
+ <feature>camel-blueprint</feature>
+ <feature>war</feature>
+ </features>
+ <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+ <repository>target/features-repo</repository>
+ </configuration>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-system-folder</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/features-repo</outputDirectory>
+ <resources>
+ <resource>
+ <directory>target/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-unix</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/dependencies/unix</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-win</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/dependencies/win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enable-obr</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="enable-obr">
+ <echo message="Updating etc/startup.properties in unix assembly" />
+ <concat destfile="target/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true" eol="unix">
+ <fileset file="target/classes/startup-obr.properties" />
+ </concat>
+ <echo message="Updating etc/startup.properties in windows assembly" />
+ <concat destfile="target/dependencies/win/apache-karaf-${karaf.version}/etc/startup.properties" append="true" eol="dos">
+ <fileset file="target/classes/startup-obr.properties" />
+ </concat>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${maven-assembly-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>unix-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <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>
+
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unix-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+ </descriptors>
+ </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>
+ </build>
+ </profile>
+ </profiles>
</project>
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=1571134&r1=1571124&r2=1571134&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/descriptors/unix-bin.xml Mon Feb 24 04:21:18 2014
@@ -23,9 +23,9 @@
</formats>
<componentDescriptors>
- <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
- <componentDescriptor>target/shared/common-unix-bin.xml</componentDescriptor>
- <componentDescriptor>target/shared/examples-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/common-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
<files>
Modified: servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml?rev=1571134&r1=1571124&r2=1571134&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/descriptors/windows-bin.xml Mon Feb 24 04:21:18 2014
@@ -23,9 +23,9 @@
</formats>
<componentDescriptors>
- <componentDescriptor>target/shared/common-bin.xml</componentDescriptor>
- <componentDescriptor>target/shared/common-windows-bin.xml</componentDescriptor>
- <componentDescriptor>target/shared/examples-windows-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/common-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/common-windows-bin.xml</componentDescriptor>
+ <componentDescriptor>target/classes/examples-windows-bin.xml</componentDescriptor>
</componentDescriptors>
<files>
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=1571134&r1=1571124&r2=1571134&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 Mon Feb 24 04:21:18 2014
@@ -66,14 +66,14 @@
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
- <directory>target/shared/etc</directory>
+ <directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>target/shared/licenses</directory>
+ <directory>target/classes/licenses</directory>
<outputDirectory>/licenses/</outputDirectory>
<lineEnding>unix</lineEnding>
<fileMode>0644</fileMode>
Modified: servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml?rev=1571134&r1=1571124&r2=1571134&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/resources/common-windows-bin.xml Mon Feb 24 04:21:18 2014
@@ -55,14 +55,14 @@
<!-- Copy over everything that needs to get dos line endings -->
<fileSet>
- <directory>target/shared/etc</directory>
+ <directory>target/classes/etc</directory>
<outputDirectory>/etc/</outputDirectory>
<lineEnding>dos</lineEnding>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
- <directory>target/shared/licenses</directory>
+ <directory>target/classes/licenses</directory>
<outputDirectory>/licenses/</outputDirectory>
<lineEnding>dos</lineEnding>
<fileMode>0644</fileMode>
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=1571134&r1=1571124&r2=1571134&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 Mon Feb 24 04:21:18 2014
@@ -68,7 +68,7 @@
<files>
<file>
- <source>${basedir}/target/shared/pom.xml</source>
+ <source>${basedir}/target/classes/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
Modified: servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml?rev=1571134&r1=1571124&r2=1571134&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/resources/examples-windows-bin.xml Mon Feb 24 04:21:18 2014
@@ -68,7 +68,7 @@
<files>
<file>
- <source>${basedir}/target/shared/pom.xml</source>
+ <source>${basedir}/target/classes/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>