You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/03/05 07:34:23 UTC
svn commit: r750335 - in /camel/branches/camel-1.x: ./
tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Author: davsclaus
Date: Thu Mar 5 06:34:23 2009
New Revision: 750335
URL: http://svn.apache.org/viewvc?rev=750335&view=rev
Log:
Merged revisions 750334 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r750334 | davsclaus | 2009-03-05 07:25:47 +0100 (Thu, 05 Mar 2009) | 1 line
CAMEL-1423: camel:run now uses same configuraiton name for DOT as camel:dot, and its disabled by default now in camel:run.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 5 06:34:23 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749956,750017
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749956,750017,750334
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java?rev=750335&r1=750334&r2=750335&view=diff
==============================================================================
--- camel/branches/camel-1.x/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java (original)
+++ camel/branches/camel-1.x/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java Thu Mar 5 06:34:23 2009
@@ -99,12 +99,11 @@
protected String dotDir;
/**
- * Allows the DOT file generation to be disabled
+ * Allows the DOT file generation to be enabled
*
- * @parameter expression="true"
- * @readonly
+ * @parameter expression="false"
*/
- protected boolean dotEnabled;
+ protected boolean useDot;
/**
* @component
@@ -337,7 +336,7 @@
// lets create the command line arguments to pass in...
List<String> args = new ArrayList<String>();
- if (dotDir != null && dotEnabled) {
+ if (dotDir != null && useDot) {
args.add("-o");
args.add(dotDir);
}