You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/03/25 11:45:25 UTC
svn commit: r758209 - in /camel/trunk/tooling/maven/camel-maven-plugin:
pom.xml src/main/java/org/apache/camel/maven/RunMojo.java
Author: ningjiang
Date: Wed Mar 25 10:45:22 2009
New Revision: 758209
URL: http://svn.apache.org/viewvc?rev=758209&view=rev
Log:
CAMEL-1126 support Spring-JavaConfig in the camel:run plugin
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=758209&r1=758208&r2=758209&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Wed Mar 25 10:45:22 2009
@@ -38,7 +38,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Modified: camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java?rev=758209&r1=758208&r2=758209&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java Wed Mar 25 10:45:22 2009
@@ -178,6 +178,20 @@
private String mainClass;
/**
+ * The basedPackages that spring java config want to gets.
+ *
+ * @parameter expression="${camel.basedPackages}"
+ */
+ private String basedPackages;
+
+ /**
+ * The configClasses that spring java config want to gets.
+ *
+ * @parameter expression="${camel.configClasses}"
+ */
+ private String configClasses;
+
+ /**
* The classpath based application context uri that spring want to gets.
*
* @parameter expression="${camel.applicationContextUri}"
@@ -330,6 +344,7 @@
* @throws MojoFailureException something bad happened...
*/
public void execute() throws MojoExecutionException, MojoFailureException {
+ boolean usingSpringJavaConfigureMain = false;
if (killAfter != -1) {
getLog().warn("Warning: killAfter is now deprecated. Do you need it ? Please comment on MEXEC-6.");
}
@@ -359,7 +374,18 @@
args.add("-fa");
args.add(fileApplicationContextUri);
}
-
+
+ if (configClasses != null) {
+ args.add("-cc");
+ args.add(configClasses);
+ usingSpringJavaConfigureMain = true;
+ }
+ if (basedPackages != null) {
+ args.add("-bp");
+ args.add(basedPackages);
+ usingSpringJavaConfigureMain = true;
+ }
+
args.add("-d");
args.add(duration);
if (arguments != null) {
@@ -367,6 +393,11 @@
}
arguments = new String[args.size()];
args.toArray(arguments);
+
+ if (usingSpringJavaConfigureMain) {
+ mainClass = "org.apache.camel.spring.javaconfig.Main";
+ getLog().info("Using the org.apache.camel.spring.javaconfig.Main to initate a camel context");
+ }
if (getLog().isDebugEnabled()) {
StringBuffer msg = new StringBuffer("Invoking : ");