You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/08/09 15:11:03 UTC
svn commit: r564193 - in /activemq/camel/trunk: ./
examples/camel-example-bam/
examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/
examples/camel-example-bam/src/test/java/org/apache/camel/example/bam/
examples/camel-example-etl/ exa...
Author: jstrachan
Date: Thu Aug 9 06:11:02 2007
New Revision: 564193
URL: http://svn.apache.org/viewvc?view=rev&rev=564193
Log:
fixed the ETL and BAM examples so that they can be run via 'mvn camel:run' or 'mvn compile exec:java'. The killer thing that was really confusing the hell out of me as to why they wouldn't run was the dreaded <scope>test</scope> in commons-collections in the root pom - from now on, never put a test scope in root pom <dependencyManagement> sections - its so confusing as it breaks all kinds of plugins! :)
Added:
activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java (with props)
Removed:
activemq/camel/trunk/examples/camel-example-bam/src/test/java/org/apache/camel/example/bam/RunTest.java
activemq/camel/trunk/examples/camel-example-etl/src/test/java/org/apache/camel/example/etl/RunTest.java
Modified:
activemq/camel/trunk/examples/camel-example-bam/pom.xml
activemq/camel/trunk/examples/camel-example-etl/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/pom.xml?view=diff&rev=564193&r1=564192&r2=564193
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-bam/pom.xml Thu Aug 9 06:11:02 2007
@@ -33,16 +33,6 @@
<description>An example showing how to use Camel as a Business Activity Monitoring tool</description>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jpa</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bam</artifactId>
@@ -111,34 +101,13 @@
<artifactId>camel-maven-plugin</artifactId>
</plugin>
- <!-- allows the example to be ran via 'mvn exec:java' -->
+ <!-- allows the example to be ran via 'mvn compile exec:java' -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <!--
- <goals>
- <goal>java</goal>
- </goals>
- -->
- <phase>install</phase>
- </execution>
- </executions>
<configuration>
- <mainClass>org.apache.camel.example.etl.Main</mainClass>
+ <mainClass>org.apache.camel.example.bam.Main</mainClass>
<includePluginDependencies>false</includePluginDependencies>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <excludes>
- <exclude>**/RunTest.*</exclude>
- </excludes>
</configuration>
</plugin>
Added: activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java?view=auto&rev=564193
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java (added)
+++ activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java Thu Aug 9 06:11:02 2007
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.bam;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class Main {
+
+ public static void main(String[] args) {
+ org.apache.camel.spring.Main.main(args);
+ }
+}
Propchange: activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-etl/pom.xml?view=diff&rev=564193&r1=564192&r2=564193
==============================================================================
--- activemq/camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-etl/pom.xml Thu Aug 9 06:11:02 2007
@@ -105,20 +105,10 @@
<artifactId>camel-maven-plugin</artifactId>
</plugin>
- <!-- allows the example to be ran via 'mvn exec:java' -->
+ <!-- allows the example to be ran via 'mvn compile exec:java' -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <!--
- <goals>
- <goal>java</goal>
- </goals>
- -->
- <phase>install</phase>
- </execution>
- </executions>
<configuration>
<mainClass>org.apache.camel.example.etl.Main</mainClass>
<includePluginDependencies>false</includePluginDependencies>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=564193&r1=564192&r2=564193
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Thu Aug 9 06:11:02 2007
@@ -368,31 +368,26 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
- <scope>test</scope>
</dependency>
@@ -537,13 +532,11 @@
<groupId>groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.0</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.script</groupId>
<artifactId>groovy-engine</artifactId>
<version>20070112</version>
- <scope>test</scope>
</dependency>
@@ -612,7 +605,6 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
- <scope>test</scope>
</dependency>
</dependencies>