You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/04/03 09:41:17 UTC
svn commit: r930489 - in /servicemix/smx3/trunk:
distributions/apache-servicemix/pom.xml
distributions/apache-servicemix/src/main/assembly/unix-bin.xml
distributions/apache-servicemix/src/main/assembly/windows-bin.xml pom.xml
Author: jbonofre
Date: Sat Apr 3 07:41:16 2010
New Revision: 930489
URL: http://svn.apache.org/viewvc?rev=930489&view=rev
Log:
[SM-1935] Sample POMs are now sync with SMX release.
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
servicemix/smx3/trunk/pom.xml
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=930489&r1=930488&r2=930489&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Sat Apr 3 07:41:16 2010
@@ -723,12 +723,12 @@
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/samples/bridge-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/bridge-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.bridge</groupId>
<artifactId>bridge-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -742,12 +742,12 @@
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/samples/bridge-camel-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/bridge-camel-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.bridge-camel</groupId>
<artifactId>bridge-camel-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -760,12 +760,12 @@
<goal>copy</goal>
</goals>
<configuration>
- <outputDirectory>target/samples/loan-broker-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/loan-broker-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.loan-broker</groupId>
<artifactId>loan-broker-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -779,12 +779,12 @@
</goals>
<configuration>
<id>wsdl-first</id>
- <outputDirectory>target/samples/wsdl-first-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/wsdl-first-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -798,12 +798,12 @@
</goals>
<configuration>
<id>cxf-wsdl-first</id>
- <outputDirectory>target/samples/cxf-wsdl-first-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/cxf-wsdl-first-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples.cxf-wsdl-first</groupId>
<artifactId>wsdl-first-cxf-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -817,12 +817,12 @@
</goals>
<configuration>
<id>camel</id>
- <outputDirectory>target/samples/camel-${servicemix-version}</outputDirectory>
+ <outputDirectory>target/samples/camel-${pom.version}</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>camel-sa</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -840,56 +840,56 @@
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>servicemix-web</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>cxf-wsdl-first</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>loan-broker</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>bridge-camel</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>basic</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>camel</artifactId>
- <version>${servicemix-version}</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
@@ -907,7 +907,7 @@
<inputDirectory>${basedir}/src/main/release</inputDirectory>
<outputDirectory>${basedir}/target/filtered</outputDirectory>
<filters>
- <servicemix-version>${servicemix-version}</servicemix-version>
+ <servicemix-version>${pom.version}</servicemix-version>
<servicemix-common-version>${servicemix-common-version}</servicemix-common-version>
<servicemix-wsn2005-version>${servicemix-common-version}</servicemix-wsn2005-version>
<releases-repo-url>${releases-repo-url}</releases-repo-url>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml?rev=930489&r1=930488&r2=930489&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/unix-bin.xml Sat Apr 3 07:41:16 2010
@@ -71,35 +71,35 @@
<outputDirectory>schemas</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/servicemix-web-${servicemix-version}</directory>
+ <directory>target/samples/servicemix-web-${pom.version}</directory>
<outputDirectory>examples/servicemix-web</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/wsdl-first-${servicemix-version}</directory>
+ <directory>target/samples/wsdl-first-${pom.version}</directory>
<outputDirectory>examples/wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/cxf-wsdl-first-${servicemix-version}</directory>
+ <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
<outputDirectory>examples/cxf-wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/loan-broker-${servicemix-version}</directory>
+ <directory>target/samples/loan-broker-${pom.version}</directory>
<outputDirectory>examples/loan-broker-bpel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-${servicemix-version}</directory>
+ <directory>target/samples/bridge-${pom.version}</directory>
<outputDirectory>examples/bridge</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-camel-${servicemix-version}</directory>
+ <directory>target/samples/bridge-camel-${pom.version}</directory>
<outputDirectory>examples/bridge-camel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/basic-${servicemix-version}</directory>
+ <directory>target/samples/basic-${pom.version}</directory>
<outputDirectory>examples/basic</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/camel-${servicemix-version}</directory>
+ <directory>target/samples/camel-${pom.version}</directory>
<outputDirectory>examples/camel</outputDirectory>
</fileSet>
<fileSet>
Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml?rev=930489&r1=930488&r2=930489&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/windows-bin.xml Sat Apr 3 07:41:16 2010
@@ -63,35 +63,35 @@
<outputDirectory>schemas</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/servicemix-web-${servicemix-version}</directory>
+ <directory>target/samples/servicemix-web-${pom.version}</directory>
<outputDirectory>examples/servicemix-web</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/wsdl-first-${servicemix-version}</directory>
+ <directory>target/samples/wsdl-first-${pom.version}</directory>
<outputDirectory>examples/wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/cxf-wsdl-first-${servicemix-version}</directory>
+ <directory>target/samples/cxf-wsdl-first-${pom.version}</directory>
<outputDirectory>examples/cxf-wsdl-first</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/loan-broker-${servicemix-version}</directory>
+ <directory>target/samples/loan-broker-${pom.version}</directory>
<outputDirectory>examples/loan-broker-bpel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-${servicemix-version}</directory>
+ <directory>target/samples/bridge-${pom.version}</directory>
<outputDirectory>examples/bridge</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/bridge-camel-${servicemix-version}</directory>
+ <directory>target/samples/bridge-camel-${pom.version}</directory>
<outputDirectory>examples/bridge-camel</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/basic-${servicemix-version}</directory>
+ <directory>target/samples/basic-${pom.version}</directory>
<outputDirectory>examples/basic</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/samples/camel-${servicemix-version}</directory>
+ <directory>target/samples/camel-${pom.version}</directory>
<outputDirectory>examples/camel</outputDirectory>
</fileSet>
<fileSet>
Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=930489&r1=930488&r2=930489&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Sat Apr 3 07:41:16 2010
@@ -108,7 +108,6 @@
<geronimo-connector-version>2.1.4</geronimo-connector-version>
<geronimo-transaction-version>2.1.4</geronimo-transaction-version>
<slf4j-version>1.4.3</slf4j-version>
- <servicemix-version>3.3.2-SNAPSHOT</servicemix-version>
<wsdl4j-version>1.6.2</wsdl4j-version>
<commons-beanutils-version>1.7.0</commons-beanutils-version>
<commons-fileupload-version>1.1.1</commons-fileupload-version>