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 2008/06/17 08:36:22 UTC
svn commit: r668407 - in
/servicemix/smx3/branches/servicemix-3.2/samples/camel:
camel-sa-itest/pom.xml camel-sa/pom.xml camel-simple-su/pom.xml pom.xml
src/main/assembly/src.xml
Author: ffang
Date: Mon Jun 16 23:36:21 2008
New Revision: 668407
URL: http://svn.apache.org/viewvc?rev=668407&view=rev
Log:
[SM-1403]Clean up the ServiceMix example of Camel
Modified:
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/pom.xml
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa/pom.xml
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-simple-su/pom.xml
servicemix/smx3/branches/servicemix-3.2/samples/camel/pom.xml
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml
Modified: servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/pom.xml?rev=668407&r1=668406&r2=668407&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/pom.xml Mon Jun 16 23:36:21 2008
@@ -34,13 +34,7 @@
<name>ServiceMix :: Samples :: Camel :: SA :: iTest</name>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.servicemix.samples</groupId>
- <artifactId>camel-simple-su</artifactId>
- <version>3.2.2-SNAPSHOT</version>
- </dependency>
--->
+
<dependency>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>camel-sa</artifactId>
@@ -52,7 +46,10 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-camel</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,7 +103,7 @@
</property>
</systemProperties>
<includes>
- <include>**/*NoVersionsTest.*</include>
+ <include>**/*Test.*</include>
</includes>
</configuration>
</plugin>
Modified: servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa/pom.xml?rev=668407&r1=668406&r2=668407&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa/pom.xml Mon Jun 16 23:36:21 2008
@@ -23,9 +23,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.samples</groupId>
- <artifactId>camel</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.samples</groupId>
+ <artifactId>camel</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.samples</groupId>
@@ -35,10 +35,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.samples</groupId>
- <artifactId>camel-simple-su</artifactId>
- <version>3.2.2-SNAPSHOT</version>
- </dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-camel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.samples</groupId>
+ <artifactId>camel-simple-su</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-simple-su/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-simple-su/pom.xml?rev=668407&r1=668406&r2=668407&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-simple-su/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-simple-su/pom.xml Mon Jun 16 23:36:21 2008
@@ -32,17 +32,19 @@
<artifactId>camel-simple-su</artifactId>
<packaging>jbi-service-unit</packaging>
<name>ServiceMix :: Samples :: Camel :: Simple SU</name>
+ <properties>
+ <componentName>servicemix-camel</componentName>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-camel</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <artifactId>servicemix-camel</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <artifactId>servicemix-core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -63,14 +65,7 @@
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
<extensions>true</extensions>
- </plugin>
- <!-- allows the route to be ran via 'mvn camel:run' -->
-<!--
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- </plugin>
--->
+ </plugin>
</plugins>
</build>
</project>
Modified: servicemix/smx3/branches/servicemix-3.2/samples/camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/pom.xml?rev=668407&r1=668406&r2=668407&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/samples/camel/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/samples/camel/pom.xml Mon Jun 16 23:36:21 2008
@@ -88,6 +88,22 @@
</repository>
</repositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-camel</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
Modified: servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml?rev=668407&r1=668406&r2=668407&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml Mon Jun 16 23:36:21 2008
@@ -30,11 +30,15 @@
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>pom.xml</include>
- <include>*.html</include>
- <include>src/**/*</include>
+ <include>*.html</include>
<include>*/pom.xml</include>
- <include>*/src/**/*</include>
+ <include>camel-sa/*</include>
+ <include>camel-simple-su/*</include>
</includes>
+ <excludes>
+ <exclude>camel-sa-itest/*</exclude>
+ <exclude>*/target/**</exclude>
+ </excludes>
</fileSet>
</fileSets>
</assembly>