buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/15010 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
buildbot failure in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/15009 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/15007 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
buildbot exception in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/15006 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: exception compile sincerely, -The Buildbot
svn commit: r889119 - in /websites/production/camel/content: cache/main.pageCache guice-maven-plugin.html
Author: buildbot Date: Wed Dec 4 18:18:55 2013 New Revision: 889119 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/guice-maven-plugin.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/guice-maven-plugin.html == --- websites/production/camel/content/guice-maven-plugin.html (original) +++ websites/production/camel/content/guice-maven-plugin.html Wed Dec 4 18:18:55 2013 @@ -128,7 +128,7 @@ Available as of Camel 2.13.0 -In case you want to make use of an optional JNDI properties file, for example in case when https://code.google.com/p/guiceyfruit/wiki/JNDI"; rel="nofollow">the GuiceyFruit JNDI Provider is in use, then this is how you can specify it: +Optionally if the name of your JNDI properties file is something else other than the default jndi.properties or if it's not on the default classpath, then you can make use of the jndiProperties option as shown below:
[CONF] Apache Camel > Guice Maven Plugin
Guice Maven Plugin
Page edited by Babak Vahdat
Changes (1)
...
*Available as of Camel 2.13.0*
Optionally if the name of your JNDI property properties file is something else other than the default {{jndi.properties}} or if it's not on the default classpath, then you can make use of the {{jndiProperties}} option as shown below:
{code:lang=xml}
...
Full Content
Guice Maven Plugin
The Guice Maven Plugin allows you to run your Enterprise Integration Patterns using Guice for Dependency Injection inside Maven along with being able to support Visualisation along with integration of the Visualisation diagrams into the standard maven reports for your project.
Goals Supported
Documentation
Reference
Description
guice:run
guice:run
Boots up Camel in the context of a separately initiated Java thread using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules
guice:embedded
guice:embedded
Boots up Camel using the Guice configuration at jndi.properties on the classpath and runs your routing rules
guice:dot
guice:dot
Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports
Adding the plugin to your pom.xml
Add the following in your section
org.apache.camel
guice-maven-plugin/artifactId>
You can also specify what Main class to use when running the plugin. By default this is org.apache.camel.guice.Main.
org.apache.camel
guice-maven-plugin/artifactId>
mypackage.boot.camel.CamelStartup
Making use of an optional JNDI properties file
Available as of Camel 2.13.0
Optionally if the name of your JNDI properties file is something else other than the default jndi.properties or if it's not on the default classpath, then you can make use of the jndiProperties option as shown below:
org.apache.camel
guice-maven-plugin/artifactId>
/path/to/my/jndi/properties/my-guice-jndi.properties
Classpath
The plugin will construct a classpath of any Maven dependency with scope "compile". The classpath is output as an INFO log statement upon startup.
Route Information
Information about the generated routes is available through the GraphViz report, and also through the log statements generated by the run goal. If you would like to see this information then add a log4j (or other commons-logging implementation) config file with the following levels.
src/main/resources/log4.properties
log4j.rootLogger=INFO, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
log4j.logger.org.apache.camel.impl.DefaultCamelContext=DEBUG, stdout
log4j.additivity.org.apache.camel.impl.DefaultCamelContext=false
This should produce a log statement similar to:
670 [org.apache.camel.guice.Main.main()] DEBUG org.apache.camel.impl.DefaultCamelContext
- Adding routes from: Routes: [Route[ [From[jms:queue:queueA]] -> [To[jms:queue:queueB], To[jms:queue:queueC routes: []
Integration into Maven Reports
If you add the guice-maven-plugin to your section of your pom you will automatically get the Visualisation reporting generated for your project as part of the regular maven site generation.
For example add the following into your pom
...
org.apache.camel
guice-maven-plugin/artifactId>
Then when you run
mvn site
Your context will be booted up via the jndi.properties files, the DOT file generated and a nice HTML report created.
GraphViz DOT requiredNote to get the nice HTML, PNG and SVG outputs from the DOT files you will need to install the GraphViz DOT executable and add it to your PATH so that the plugin can invoke DOT to generate the PNG/SVG files.
For more details see the guice:dot.
Stop watching space
|
Change email notification preferences
View Online
|
View Changes
[CONF] Apache Camel > Guice Maven Plugin
Guice Maven Plugin
Page edited by Babak Vahdat
Changes (3)
...
*Available as of Camel 2.13.0*
In case you want to make use of an optional JNDI properties file, for example in case when [the GuiceyFruit JNDI Provider|https://code.google.com/p/guiceyfruit/wiki/JNDI] is in use, then this is how you can specify it:
Optionally if the name of your JNDI property file is something else other than the default {{jndi.properties}} or if it's not on the default classpath, then you can make use of the {{jndiProperties}} option as shown below:
{code:lang=xml}
...
guice-maven-plugin/artifactId>
/path/to/my/jndi/properties/my-guice-jndi.properties
...
Full Content
Guice Maven Plugin
The Guice Maven Plugin allows you to run your Enterprise Integration Patterns using Guice for Dependency Injection inside Maven along with being able to support Visualisation along with integration of the Visualisation diagrams into the standard maven reports for your project.
Goals Supported
Documentation
Reference
Description
guice:run
guice:run
Boots up Camel in the context of a separately initiated Java thread using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules
guice:embedded
guice:embedded
Boots up Camel using the Guice configuration at jndi.properties on the classpath and runs your routing rules
guice:dot
guice:dot
Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports
Adding the plugin to your pom.xml
Add the following in your section
org.apache.camel
guice-maven-plugin/artifactId>
You can also specify what Main class to use when running the plugin. By default this is org.apache.camel.guice.Main.
org.apache.camel
guice-maven-plugin/artifactId>
mypackage.boot.camel.CamelStartup
Making use of an optional JNDI properties file
Available as of Camel 2.13.0
Optionally if the name of your JNDI property file is something else other than the default jndi.properties or if it's not on the default classpath, then you can make use of the jndiProperties option as shown below:
org.apache.camel
guice-maven-plugin/artifactId>
/path/to/my/jndi/properties/my-guice-jndi.properties
Classpath
The plugin will construct a classpath of any Maven dependency with scope "compile". The classpath is output as an INFO log statement upon startup.
Route Information
Information about the generated routes is available through the GraphViz report, and also through the log statements generated by the run goal. If you would like to see this information then add a log4j (or other commons-logging implementation) config file with the following levels.
src/main/resources/log4.properties
log4j.rootLogger=INFO, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
log4j.logger.org.apache.camel.impl.DefaultCamelContext=DEBUG, stdout
log4j.additivity.org.apache.camel.impl.DefaultCamelContext=false
This should produce a log statement similar to:
670 [org.apache.camel.guice.Main.main()] DEBUG org.apache.camel.impl.DefaultCamelContext
- Adding routes from: Routes: [Route[ [From[jms:queue:queueA]] -> [To[jms:queue:queueB], To[jms:queue:queueC routes: []
Integration into Maven Reports
If you add the guice-maven-plugin to your section of your pom you will automatically get the Visualisation reporting generated for your project as part of the regular maven site generation.
For example add the following into your pom
...
org.apache.camel
guice-maven-plugin/artifactId>
Then when you run
mvn site
Your context will be booted up via the jndi.properties files, the DOT file generated and a nice HTML report created.
GraphViz DOT requiredNote to get the nice HTML, PNG and SVG outputs from the DOT files you will need to install the GraphViz DOT executable and add it to your PATH so that the plugin can invoke DOT to generate the PNG/SVG files.
For more details see the guice:dot.
Stop watching space
|
Change email notification preferences
View Online
|
View Changes
git commit: CAMEL-7038: Polished the Javadoc.
Updated Branches:
refs/heads/master 4e4cb68ec -> 298889a9d
CAMEL-7038: Polished the Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/298889a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/298889a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/298889a9
Branch: refs/heads/master
Commit: 298889a9d5da35d25b6dd63ca2d2e05ba371a874
Parents: 4e4cb68
Author: Babak Vahdat
Authored: Wed Dec 4 17:52:06 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 17:52:06 2013 +0100
--
.../java/org/apache/camel/guice/maven/EmbeddedMojo.java | 9 -
.../src/main/java/org/apache/camel/guice/maven/RunMojo.java | 9 -
2 files changed, 8 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/298889a9/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
index e3c7b3c..68a7c5a 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
@@ -75,11 +75,10 @@ public class EmbeddedMojo extends AbstractExecMojo {
protected boolean dotAggregationEnabled;
/**
- * Allows to provide a custom properties file to initialize a
- * {@link javax.naming.InitialContext} object with. As an example this
- * argument can be be passed when making use of the GuiceyFruit JNDI
- * Provider where the properties file name is something else other than the
- * default {@code jndi.properties}
+ * Allows to provide a custom properties file on the classpath to
initialize
+ * a {@link javax.naming.InitialContext} object with. This corresponds to
+ * the {@link org.apache.camel.guice.Main#setJndiProperties(String)} API
+ * method
*
* @parameter property="jndiProperties"
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/298889a9/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index c953003..4d1979f 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -108,11 +108,10 @@ public class RunMojo extends AbstractExecMojo {
protected boolean dotEnabled;
/**
- * Allows to provide a custom properties file to initialize a
- * {@link javax.naming.InitialContext} object with. As an example this
- * argument can be be passed when making use of the GuiceyFruit JNDI
- * Provider where the properties file name is something else other than the
- * default {@code jndi.properties}
+ * Allows to provide a custom properties file on the classpath to
initialize
+ * a {@link javax.naming.InitialContext} object with. This corresponds to
+ * the {@link org.apache.camel.guice.Main#setJndiProperties(String)} API
+ * method
*
* @parameter property="jndiProperties"
*/
svn commit: r889096 - in /websites/production/camel/content: cache/main.pageCache guice-maven-plugin.html
Author: buildbot Date: Wed Dec 4 14:19:01 2013 New Revision: 889096 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/guice-maven-plugin.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/guice-maven-plugin.html == --- websites/production/camel/content/guice-maven-plugin.html (original) +++ websites/production/camel/content/guice-maven-plugin.html Wed Dec 4 14:19:01 2013 @@ -124,6 +124,24 @@ ]]> +Making use of an optional JNDI properties file + +Available as of Camel 2.13.0 + +In case you want to make use of an optional JNDI properties file, for example in case when https://code.google.com/p/guiceyfruit/wiki/JNDI"; rel="nofollow">the GuiceyFruit JNDI Provider is in use, then this is how you can specify it: + + + + + Classpath The plugin will construct a classpath of any Maven dependency with scope "compile". The classpath is output as an INFO log statement upon startup.
[CONF] Apache Camel > Guice Maven Plugin
Guice Maven Plugin
Page edited by Babak Vahdat
Changes (1)
...
{code}
h3. Making use of an optional JNDI properties file *Available as of Camel 2.13.0* In case you want to make use of an optional JNDI properties file, for example in case when [the GuiceyFruit JNDI Provider|https://code.google.com/p/guiceyfruit/wiki/JNDI] is in use, then this is how you can specify it: {code:lang=xml}org.apache.camel guice-maven-plugin/artifactId>/my-guice-jndi.properties {code}
h3. Classpath
...
Full Content
Guice Maven Plugin
The Guice Maven Plugin allows you to run your Enterprise Integration Patterns using Guice for Dependency Injection inside Maven along with being able to support Visualisation along with integration of the Visualisation diagrams into the standard maven reports for your project.
Goals Supported
Documentation
Reference
Description
guice:run
guice:run
Boots up Camel in the context of a separately initiated Java thread using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules
guice:embedded
guice:embedded
Boots up Camel using the Guice configuration at jndi.properties on the classpath and runs your routing rules
guice:dot
guice:dot
Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports
Adding the plugin to your pom.xml
Add the following in your section
org.apache.camel
guice-maven-plugin/artifactId>
You can also specify what Main class to use when running the plugin. By default this is org.apache.camel.guice.Main.
org.apache.camel
guice-maven-plugin/artifactId>
mypackage.boot.camel.CamelStartup
Making use of an optional JNDI properties file
Available as of Camel 2.13.0
In case you want to make use of an optional JNDI properties file, for example in case when the GuiceyFruit JNDI Provider is in use, then this is how you can specify it:
org.apache.camel
guice-maven-plugin/artifactId>
/my-guice-jndi.properties
Classpath
The plugin will construct a classpath of any Maven dependency with scope "compile". The classpath is output as an INFO log statement upon startup.
Route Information
Information about the generated routes is available through the GraphViz report, and also through the log statements generated by the run goal. If you would like to see this information then add a log4j (or other commons-logging implementation) config file with the following levels.
src/main/resources/log4.properties
log4j.rootLogger=INFO, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
log4j.logger.org.apache.camel.impl.DefaultCamelContext=DEBUG, stdout
log4j.additivity.org.apache.camel.impl.DefaultCamelContext=false
This should produce a log statement similar to:
670 [org.apache.camel.guice.Main.main()] DEBUG org.apache.camel.impl.DefaultCamelContext
- Adding routes from: Routes: [Route[ [From[jms:queue:queueA]] -> [To[jms:queue:queueB], To[jms:queue:queueC routes: []
Integration into Maven Reports
If you add the guice-maven-plugin to your section of your pom you will automatically get the Visualisation reporting generated for your project as part of the regular maven site generation.
For example add the following into your pom
...
org.apache.camel
guice-maven-plugin/artifactId>
Then when you run
mvn site
Your context will be booted up via the jndi.properties files, the DOT file generated and a nice HTML report created.
GraphViz DOT requiredNote to get the nice HTML, PNG and SVG outputs from the DOT files you will need to install the GraphViz DOT executable and add it to your PATH so that the plugin can invoke DOT to generate the PNG/SVG files.
For more details see the guice:dot.
Stop watching space
|
Change email notification preferences
View Online
|
View Changes
svn commit: r889092 - in /websites/production/camel/content: cache/main.pageCache guice-maven-plugin.html
Author: buildbot Date: Wed Dec 4 13:19:06 2013 New Revision: 889092 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/guice-maven-plugin.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/guice-maven-plugin.html == --- websites/production/camel/content/guice-maven-plugin.html (original) +++ websites/production/camel/content/guice-maven-plugin.html Wed Dec 4 13:19:06 2013 @@ -92,7 +92,7 @@ Goals Supported - Documentation Reference Description guice:run http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/run-mojo.html";>guice:run Boots up Camel in a new JVM using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules guice: embedded http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/embedded-mojo.html";>guice:embedded Boots up Camel in the same JVM as Maven using the Guice configuration at jndi.properties on the classpath and runs your routing rules guice:dot http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/dot-mojo.html";>guice:dot Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports + Documentation Reference Description guice:run http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/run-mojo.html";>guice:run Boots up Camel in the context of a separately initiated Java thread using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules guice:embedded http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/embedded-mojo.html";>guice:embedded Boots up Camel using the Guice configuration at jndi.properties on the classpath and runs your routing rules guice:dot http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/dot-mojo.html";>guice:dot Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports
git commit: CAMEL-7038: Polished.
Updated Branches:
refs/heads/master 33d7c49cb -> 4e4cb68ec
CAMEL-7038: Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e4cb68e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e4cb68e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e4cb68e
Branch: refs/heads/master
Commit: 4e4cb68ece9115ec6ce7c6b61e693aa257d10119
Parents: 33d7c49
Author: Babak Vahdat
Authored: Wed Dec 4 13:35:44 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 13:35:44 2013 +0100
--
.../main/java/org/apache/camel/guice/maven/EmbeddedMojo.java| 5 +++--
.../src/main/java/org/apache/camel/guice/maven/RunMojo.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4e4cb68e/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
index a120f9a..e3c7b3c 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
@@ -76,9 +76,10 @@ public class EmbeddedMojo extends AbstractExecMojo {
/**
* Allows to provide a custom properties file to initialize a
- * {@link javax.naming.InitialContext} object with. As an exmaple this
+ * {@link javax.naming.InitialContext} object with. As an example this
* argument can be be passed when making use of the GuiceyFruit JNDI
- * Provider
+ * Provider where the properties file name is something else other than the
+ * default {@code jndi.properties}
*
* @parameter property="jndiProperties"
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/4e4cb68e/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index eae01f0..c953003 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -109,9 +109,10 @@ public class RunMojo extends AbstractExecMojo {
/**
* Allows to provide a custom properties file to initialize a
- * {@link javax.naming.InitialContext} object with. As an exmaple this
+ * {@link javax.naming.InitialContext} object with. As an example this
* argument can be be passed when making use of the GuiceyFruit JNDI
- * Provider
+ * Provider where the properties file name is something else other than the
+ * default {@code jndi.properties}
*
* @parameter property="jndiProperties"
*/
git commit: CAMEL-7038: Polished.
Updated Branches:
refs/heads/master 4ca362155 -> 33d7c49cb
CAMEL-7038: Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33d7c49c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33d7c49c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33d7c49c
Branch: refs/heads/master
Commit: 33d7c49cb2c124f2b102f0b0221cfaf089b88915
Parents: 4ca3621
Author: Babak Vahdat
Authored: Wed Dec 4 13:27:36 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 13:27:36 2013 +0100
--
.../camel-guice/src/main/java/org/apache/camel/guice/Main.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/33d7c49c/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
--
diff --git
a/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
b/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
index 1d6d375..4966bd0 100644
--- a/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
+++ b/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
@@ -33,6 +33,7 @@ import com.google.common.collect.Maps;
import com.google.inject.Binding;
import com.google.inject.Injector;
import com.google.inject.Key;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.guice.inject.Injectors;
@@ -130,7 +131,7 @@ public class Main extends MainSupport {
}
protected void doStop() throws Exception {
-LOG.info("Apache Camel stopping");
+super.doStop();
if (injector != null) {
Injectors.close(injector);
@@ -148,7 +149,7 @@ public class Main extends MainSupport {
for (CamelContext camelContext : getCamelContexts()) {
return camelContext.createProducerTemplate();
}
-throw new IllegalArgumentException("No CamelContexts are available so
cannot create a ProducerTemplate!");
+throw new IllegalArgumentException("No CamelContext is available so
cannot create a ProducerTemplate!");
}
protected Map getCamelContextMap() {
[CONF] Apache Camel > Guice Maven Plugin
Guice Maven Plugin Page edited by Babak Vahdat Changes (2) ... || Documentation || Reference || Description || | [guice:run|Guice Run Maven Goal] | [guice:run|http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/run-mojo.html] | Boots up Camel in the context of a new JVM separately initiated Java thread using the [Guice] configuration in the *jndi.properties* file on the classpath and runs your routing rules | | [guice:embedded|Guice Embedded Maven Goal] | [guice:embedded|http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/embedded-mojo.html] | Boots up Camel in the same JVM as Maven using the [Guice] configuration at *jndi.properties* on the classpath and runs your routing rules | | [guice:dot|Guice Dot Maven Goal] | [guice:dot|http://activemq.apache.org/camel/maven/maven-plugins/guice-maven-plugin/dot-mojo.html] | Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports | ... Full Content Guice Maven Plugin The Guice Maven Plugin allows you to run your Enterprise Integration Patterns using Guice for Dependency Injection inside Maven along with being able to support Visualisation along with integration of the Visualisation diagrams into the standard maven reports for your project. Goals Supported Documentation Reference Description guice:run guice:run Boots up Camel in the context of a separately initiated Java thread using the Guice configuration in the jndi.properties file on the classpath and runs your routing rules guice:embedded guice:embedded Boots up Camel using the Guice configuration at jndi.properties on the classpath and runs your routing rules guice:dot guice:dot Generates DOT files and then HTML, PNG, SVG files for your EIP routing rules with integration into Maven Reports Adding the plugin to your pom.xml Add the following in your section org.apache.camel guice-maven-plugin/artifactId> You can also specify what Main class to use when running the plugin. By default this is org.apache.camel.guice.Main. org.apache.camel guice-maven-plugin/artifactId> mypackage.boot.camel.CamelStartup Classpath The plugin will construct a classpath of any Maven dependency with scope "compile". The classpath is output as an INFO log statement upon startup. Route Information Information about the generated routes is available through the GraphViz report, and also through the log statements generated by the run goal. If you would like to see this information then add a log4j (or other commons-logging implementation) config file with the following levels. src/main/resources/log4.properties log4j.rootLogger=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n log4j.logger.org.apache.camel.impl.DefaultCamelContext=DEBUG, stdout log4j.additivity.org.apache.camel.impl.DefaultCamelContext=false This should produce a log statement similar to: 670 [org.apache.camel.guice.Main.main()] DEBUG org.apache.camel.impl.DefaultCamelContext - Adding routes from: Routes: [Route[ [From[jms:queue:queueA]] -> [To[jms:queue:queueB], To[jms:queue:queueC routes: [] Integration into Maven Reports If you add the guice-maven-plugin to your section of your pom you will automatically get the Visualisation reporting generated for your project as part of the regular maven site generation. For example add the following into your pom ... org.apache.camel guice-maven-plugin/artifactId> Then when you run mvn site Your context will be booted up via the jndi.properties files, the DOT file generated and a nice HTML report created. GraphViz DOT requiredNote to get the nice HTML, PNG and SVG outputs from the DOT files you will need to install the GraphViz DOT executable and add it to your PATH so that the plugin can invoke DOT to generate the PNG/SVG files. For more details see the guice:dot. Stop watching space | Change email notification preferences View Online | View Changes
svn commit: r889088 - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache crypto.html
Author: buildbot
Date: Wed Dec 4 12:19:44 2013
New Revision: 889088
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-dataformat-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/crypto.html
Modified: websites/production/camel/content/book-dataformat-appendix.html
==
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Wed Dec 4
12:19:44 2013
@@ -3784,7 +3784,7 @@ from("direct:key-in-header-decrypt").unm
PGPDataFormat
Options
- Name Type Default Description keyUserid String null The userid of the key in the PGP keyring used during
encryption. See also option keyUserids. keyUserids List null Since camel 2.12.2: PGP
allows t
o encrypt the symmetric key by several asymmetric public receiver keys. You
can specify here the User IDs of several public keys contained in the PGP
keyring. If you just have one User ID, then you can also use the option
keyUserid. The User ID specified in keyUserid and the User
IDs in keyUserids will be merged together and the corresponding public
keys will be used for the encryption. password String null Password used when opening the private key (not used for
encryption).
keyFileName
String
null Filename of the keyring; must
be accessible as a classpath resource (but you can specify a location in the
file system by using the "file:" prefix). encryptionKeyRing byte[] null Since camel 2.12.1;
encryption keyring; you can not set the keyFileName and encryptionKeyRing at
the same time.
signatureKeyUserid String null Since Camel 2.11.0; optional userid of the key in
the PGP keyring to use for signing (during encrypti
on) or signature verification (during decryption) . signaturePassword
String null Since Camel 2.11.0;
optional password used when opening the private key used for signing (during
encryption).
signatureKeyFileName String null Since Camel 2.11.0; optional filename of the
keyring to use for signing (during encryption) or for signature verification
(during decryption); must be accessible as a classpath resource (but you can
specify a location in the file system by using t
he "file:" prefix). signatureKeyRing byte[] null Since camel 2.12.1; signature keyring;
you can not set the signatureKeyFileName and signatureKeyRing at the same time.
algorithm
int
SymmetricKeyAlgorithmTags.CAST5 Since camel 2.12.2; symmetric key encryption
algorithm; possible values are defined in
org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; for example 2 (=
TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only
relevant for encryptin
g.
compressionAlgorithm int CompressionAlgorithmTags.ZIP Since camel 2.12.2;
compression algorithm; possible values are defined in
org.bouncycastle.bcpg.CompressionAlgorithmTags; for example 0 (=
UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for
encrypting.
hashAlgorithm
int
HashAlgorithmTags.SHA1 Since camel 2.12.2: signature hash algorithm;
possible values are defined in
org.bouncycastle.bcpg.HashAlgorithmTags; for example 2 (=
SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant
for signing.
armored
boolean
false This
option will cause PGP to base64 encode the encrypted text, making it available
for copy/paste, etc. integrity boolean true Adds an integrity check/sign into the encryption file.
passphraseAccessor https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java";
rel="nofollow">PGPPassphraseAccessor null Since Camel 2.12.2; provides passphrases
corresponding to user Ids. If no passpharase can be found from the option
password or signaturePassword and from the headers
CamelPGPDataFormatKeyPassword or
CamelPGPDataFormatSignatureKeyPassword then the passphrase is feteched
from the passphrase accessor. You provide a bean which implements the interface
https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java";
rel="nofollow">PGPPassphraseAccessor. A default implementation is given by
https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java";
rel="nofollow">PGPPassphraseAccessorDefault. The passphrase accessor is
especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of
Messages Encrypted/Signed by Different Private/Public Keys' below.
+ Name Type Default Description keyUserid String null The user ID of the key in the PGP keyring used dur
git commit: CAMEL-7038: Provide an option for the JNDI properties file by the Guice Maven Plugin.
Updated Branches:
refs/heads/master ae1a95636 -> 4ca362155
CAMEL-7038: Provide an option for the JNDI properties file by the Guice Maven
Plugin.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4ca36215
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4ca36215
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4ca36215
Branch: refs/heads/master
Commit: 4ca362155eaced0453c1220affb86d896037ebb1
Parents: ae1a956
Author: Babak Vahdat
Authored: Wed Dec 4 13:18:04 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 13:18:04 2013 +0100
--
.../main/java/org/apache/camel/guice/Main.java | 11 --
examples/camel-example-guice-jms/README.txt | 6 +
examples/camel-example-guice-jms/pom.xml| 11 ++
.../apache/camel/guice/maven/EmbeddedMojo.java | 23
.../org/apache/camel/guice/maven/RunMojo.java | 14
5 files changed, 63 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4ca36215/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
--
diff --git
a/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
b/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
index 76af353..1d6d375 100644
--- a/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
+++ b/components/camel-guice/src/main/java/org/apache/camel/guice/Main.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.guice;
+import java.io.BufferedInputStream;
import java.net.URL;
import java.util.LinkedList;
import java.util.Map;
@@ -32,12 +33,12 @@ import com.google.common.collect.Maps;
import com.google.inject.Binding;
import com.google.inject.Injector;
import com.google.inject.Key;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.guice.inject.Injectors;
import org.apache.camel.main.MainSupport;
import org.apache.camel.model.Constants;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
@@ -107,7 +108,13 @@ public class Main extends MainSupport {
}
if (jndiPropertiesUrl != null) {
Properties properties = new Properties();
-properties.load(jndiPropertiesUrl.openStream());
+BufferedInputStream bis = null;
+try {
+bis = IOHelper.buffered(jndiPropertiesUrl.openStream());
+properties.load(bis);
+} finally {
+IOHelper.close(bis);
+}
context = new InitialContext(properties);
} else {
context = new InitialContext();
http://git-wip-us.apache.org/repos/asf/camel/blob/4ca36215/examples/camel-example-guice-jms/README.txt
--
diff --git a/examples/camel-example-guice-jms/README.txt
b/examples/camel-example-guice-jms/README.txt
index b6228ca..fb378f3 100644
--- a/examples/camel-example-guice-jms/README.txt
+++ b/examples/camel-example-guice-jms/README.txt
@@ -13,6 +13,12 @@ You will need to compile this example first:
To run the example type
mvn exec:java
+Alternatively to run the example you can also make use of the Guice Maven
+Plugin provided by Camel, so you can instead type
+ mvn guice:run
+
+See the POM of this example about how to make use of this Maven Plugin
+
You can see the routing rules by looking at the java code in the
src/main/java directory and the guicejndi.properties file lives in
src/main/resources/guicejndi.properties
http://git-wip-us.apache.org/repos/asf/camel/blob/4ca36215/examples/camel-example-guice-jms/pom.xml
--
diff --git a/examples/camel-example-guice-jms/pom.xml
b/examples/camel-example-guice-jms/pom.xml
index 20c00da..7342686 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -128,6 +128,17 @@
+
+
+
+org.apache.camel
+guice-maven-plugin
+${project.version}
+
+5s
+/guicejndi.properties
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/4ca36215/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice
[CONF] Apache Camel > Crypto
Crypto
Page edited by Franz Forsthofer
Changes (4)
...
{div:class=confluenceTableSmall} || Name || Type || Default || Description ||
| {{keyUserid}} | {{String}} | {{null}} | The userid user ID of the key in the PGP keyring used during encryption. See also option {{keyUserids}}. Can also be only a part of a user ID. For example, if the user ID is "Test User " then you can use the part "Test User" or "" to address the user ID. |
| {{keyUserids}} | {{List}} | {{null}} | *Since camel 2.12.2*: PGP allows to encrypt the symmetric key by several asymmetric public receiver keys. You can specify here the User IDs or parts of User IDs of several public keys contained in the PGP keyring. If you just have one User ID, then you can also use the option {{keyUserid}}. The User ID specified in {{keyUserid}} and the User IDs in {{keyUserids}} will be merged together and the corresponding public keys will be used for the encryption. |
| {{password}} | {{String}} | {{null}} | Password used when opening the private key (not used for encryption). | | {{keyFileName}} | {{String}} | {{null}} | Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). | | {{encryptionKeyRing}} | {{byte\[\]}} | {{null}} | *Since camel 2.12.1*; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. |
| {{signatureKeyUserid}} | {{String}} | {{null}} | *Since Camel 2.11.0*; optional userid of the key in the PGP keyring to use for signing (during encryption) or signature verification (during decryption) .|
| {{signatureKeyUserid}} | {{String}} | {{null}} | *Since Camel 2.11.0*; optional userid of the key in the PGP keyring used for signing (during encryption) or signature verification (during decryption). Can also be only a part of a user ID. For example, if the user ID is "Test User " then you can use the part "Test User" or "" to address the user ID. |
| {{signaturePassword}} | {{String}} | {{null}} | *Since Camel 2.11.0*; optional password used when opening the private key used for signing (during encryption). | | {{signatureKeyFileName}} | {{String}} | {{null}} | *Since Camel 2.11.0*; optional filename of the keyring to use for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). |
...
Full Content
Crypto
Available as of Camel 2.3
PGP Available as of Camel 2.9
The Crypto Data Format integrates the Java Cryptographic Extension into Camel, allowing simple and flexible encryption and decryption of messages using Camel's familiar marshall and unmarshal formatting mechanism. It assumes marshalling to mean encryption to cyphertext and unmarshalling to mean decryption back to the original plaintext. This data format implements only symmetric (shared-key) encryption and decyption.
Options
Name
Type
Default
Description
algorithm
String
DES/CBC/PKCS5Padding
The JCE algorithm name indicating the cryptographic algorithm that will be used.
algorithmParameterSpec
java.security.spec.AlgorithmParameterSpec
null
A JCE AlgorithmParameterSpec used to initialize the Cipher.
bufferSize
Integer
2048
the size of the buffer used in the signature process.
cryptoProvider
String
null
The name of the JCE Security Provider that should be used.
initializationVector
byte[]
null
A byte array containing the Initialization Vector that will be used to initialize the Cipher.
inline
boolean
false
Flag indicating that the configured IV should be inlined into the encrypted data stream.
macAlgorithm
String
null
The JCE algorithm name indicating the Message Authentication algorithm.
shouldAppendHMAC
boolean
null
Flag indicating that a Message Authentication Code should be calculated and appended to the encrypted data.
Basic Usage
At its most basic all that is required to encrypt/decrypt an exchange is a shared secret key. If one or more instances of the Crypto data format are configured with this key the format can be used to encrypt the payload in one route (or part of one) and decrypted in another. For example, using the Java DSL as follows:
In Spring the dataformat is configured first and then used in routes
...
Specifying the Encryption Algorithm
Changing the algorithm is a matter of supplying the JCE algorithm name. If you change the algorithm you will need to use a compatible key.
A list of the available algorithms in Java 7 is
git commit: CAMEL-7037: Fixed the NPE when using the embedded or the run goal of guice-maven-plugin.
Updated Branches:
refs/heads/camel-2.11.x 300ecab4f -> bfd357ca5
CAMEL-7037: Fixed the NPE when using the embedded or the run goal of
guice-maven-plugin.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bfd357ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bfd357ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bfd357ca
Branch: refs/heads/camel-2.11.x
Commit: bfd357ca582a3e53e8eb513e261dca424e55ed93
Parents: 300ecab
Author: Babak Vahdat
Authored: Wed Dec 4 12:34:56 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 12:37:23 2013 +0100
--
.../java/org/apache/camel/guice/maven/EmbeddedMojo.java | 4 ++--
.../main/java/org/apache/camel/guice/maven/RunMojo.java | 11 ---
2 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bfd357ca/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
index 36d743e..ced1a95 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
@@ -45,8 +45,8 @@ public class EmbeddedMojo extends AbstractExecMojo {
* A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- * @readonly
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
http://git-wip-us.apache.org/repos/asf/camel/blob/bfd357ca/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index 1f352d5..78c032d 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -85,8 +85,8 @@ public class RunMojo extends AbstractExecMojo {
* milliseconds. A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- *
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
@@ -374,6 +374,11 @@ public class RunMojo extends AbstractExecMojo {
}
main.invoke(main, new Object[] {arguments});
} catch (Exception e) { // just pass it on
+// let it be printed so end users can see the exception on
the console
+getLog().error("*");
+getLog().error("Error occurred while running main from: "
+ mainClass);
+getLog().error(e);
+getLog().error("*");
Thread.currentThread().getThreadGroup().uncaughtException(Thread.currentThread(),
e);
}
}
@@ -399,7 +404,7 @@ public class RunMojo extends AbstractExecMojo {
try {
threadGroup.destroy();
} catch (IllegalThreadStateException e) {
-getLog().warn("Couldn't destroy threadgroup " + threadGroup,
e);
+getLog().warn("Couldn't destroy thread group " + threadGroup,
e);
}
}
git commit: CAMEL-7037: Fixed the NPE when using the embedded or the run goal of guice-maven-plugin.
Updated Branches:
refs/heads/camel-2.12.x c14b4f380 -> ba7071b2c
CAMEL-7037: Fixed the NPE when using the embedded or the run goal of
guice-maven-plugin.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba7071b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba7071b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba7071b2
Branch: refs/heads/camel-2.12.x
Commit: ba7071b2c0b463194db28ec351f16788ad64836d
Parents: c14b4f3
Author: Babak Vahdat
Authored: Wed Dec 4 12:34:56 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 12:36:37 2013 +0100
--
.../java/org/apache/camel/guice/maven/EmbeddedMojo.java | 4 ++--
.../main/java/org/apache/camel/guice/maven/RunMojo.java | 11 ---
2 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ba7071b2/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
index 36d743e..ced1a95 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
@@ -45,8 +45,8 @@ public class EmbeddedMojo extends AbstractExecMojo {
* A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- * @readonly
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
http://git-wip-us.apache.org/repos/asf/camel/blob/ba7071b2/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index 1f352d5..78c032d 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -85,8 +85,8 @@ public class RunMojo extends AbstractExecMojo {
* milliseconds. A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- *
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
@@ -374,6 +374,11 @@ public class RunMojo extends AbstractExecMojo {
}
main.invoke(main, new Object[] {arguments});
} catch (Exception e) { // just pass it on
+// let it be printed so end users can see the exception on
the console
+getLog().error("*");
+getLog().error("Error occurred while running main from: "
+ mainClass);
+getLog().error(e);
+getLog().error("*");
Thread.currentThread().getThreadGroup().uncaughtException(Thread.currentThread(),
e);
}
}
@@ -399,7 +404,7 @@ public class RunMojo extends AbstractExecMojo {
try {
threadGroup.destroy();
} catch (IllegalThreadStateException e) {
-getLog().warn("Couldn't destroy threadgroup " + threadGroup,
e);
+getLog().warn("Couldn't destroy thread group " + threadGroup,
e);
}
}
git commit: CAMEL-7037: Fixed the NPE when using the embedded or the run goal of guice-maven-plugin.
Updated Branches:
refs/heads/master f5dafb149 -> ae1a95636
CAMEL-7037: Fixed the NPE when using the embedded or the run goal of
guice-maven-plugin.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ae1a9563
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ae1a9563
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ae1a9563
Branch: refs/heads/master
Commit: ae1a956360cc863f8fc6d1b815c455163c2ed970
Parents: f5dafb1
Author: Babak Vahdat
Authored: Wed Dec 4 12:34:56 2013 +0100
Committer: Babak Vahdat
Committed: Wed Dec 4 12:34:56 2013 +0100
--
.../java/org/apache/camel/guice/maven/EmbeddedMojo.java | 4 ++--
.../main/java/org/apache/camel/guice/maven/RunMojo.java | 11 ---
2 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1a9563/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
index 36d743e..ced1a95 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
@@ -45,8 +45,8 @@ public class EmbeddedMojo extends AbstractExecMojo {
* A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- * @readonly
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
http://git-wip-us.apache.org/repos/asf/camel/blob/ae1a9563/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
--
diff --git
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
index 82e60b7..2b3d83c 100644
---
a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
+++
b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
@@ -85,8 +85,8 @@ public class RunMojo extends AbstractExecMojo {
* milliseconds. A value <= 0 will run forever.
* Adding a s indicates seconds - eg "5s" means 5 seconds.
*
- * @parameter property="-1"
- *
+ * @parameter property="camel.duration"
+ *default-value="-1"
*/
protected String duration;
@@ -370,6 +370,11 @@ public class RunMojo extends AbstractExecMojo {
.getMethod("main", String[].class);
main.invoke(null, new Object[] {arguments});
} catch (Exception e) { // just pass it on
+// let it be printed so end users can see the exception on
the console
+getLog().error("*");
+getLog().error("Error occurred while running main from: "
+ mainClass);
+getLog().error(e);
+getLog().error("*");
Thread.currentThread().getThreadGroup().uncaughtException(Thread.currentThread(),
e);
}
}
@@ -395,7 +400,7 @@ public class RunMojo extends AbstractExecMojo {
try {
threadGroup.destroy();
} catch (IllegalThreadStateException e) {
-getLog().warn("Couldn't destroy threadgroup " + threadGroup,
e);
+getLog().warn("Couldn't destroy thread group " + threadGroup,
e);
}
}
