camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1443596 - in /camel/trunk/tooling/maven: camel-maven-plugin/src/main/java/org/apache/camel/maven/ camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/ mav...
Date Thu, 07 Feb 2013 16:31:39 GMT
Author: bvahdat
Date: Thu Feb  7 16:31:39 2013
New Revision: 1443596

URL: http://svn.apache.org/viewvc?rev=1443596&view=rev
Log:
CAMEL-6050: Fixed the warnings Maven reports while building the Camel plugins.

Modified:
    camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
    camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
    camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
    camel/trunk/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageMojo.java
    camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
    camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
    camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
    camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java

Modified: camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
(original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
Thu Feb  7 16:31:39 2013
@@ -73,7 +73,7 @@ public class DotMojo extends AbstractMav
      * milliseconds. A value <= 0 will run forever.
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="2s"
+     * @parameter property="2s"
      */
     protected String duration;
 
@@ -81,7 +81,7 @@ public class DotMojo extends AbstractMav
      * Whether we should boot up camel with the META-INF/services/*.xml to
      * generate the DOT file
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      */
     protected boolean runCamel;
     
@@ -89,28 +89,28 @@ public class DotMojo extends AbstractMav
      * Should we try run the DOT executable on the generated .DOT file to
      * generate images
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      */
     protected boolean useDot;
 
     /**
      * The classpath based application context uri that spring wants to get.
      *
-     * @parameter expression="${camel.applicationContextUri}"
+     * @parameter property="camel.applicationContextUri"
      */
     protected String applicationContextUri;
 
     /**
      * The filesystem based application context uri that spring wants to get.
      *
-     * @parameter expression="${camel.fileApplicationContextUri}"
+     * @parameter property="camel.fileApplicationContextUri"
      */
     protected String fileApplicationContextUri;
 
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      *            default-value="org.apache.camel.spring.Main"
      * @required
      */
@@ -119,7 +119,7 @@ public class DotMojo extends AbstractMav
     /**
      * Reference to Maven 2 Project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -128,7 +128,7 @@ public class DotMojo extends AbstractMav
     /**
      * Base output directory.
      *
-     * @parameter expression="${project.build.directory}"
+     * @parameter property="project.build.directory"
      * @required
      */
     private File buildDirectory;
@@ -156,7 +156,7 @@ public class DotMojo extends AbstractMav
      * only if you install this program and set this property to the executable
      * dot (dot.exe on Win).
      *
-     * @parameter expression="dot"
+     * @parameter property="dot"
      */
     private String executable;
 

Modified: camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
(original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
Thu Feb  7 16:31:39 2013
@@ -46,7 +46,7 @@ public class EmbeddedMojo extends Abstra
      * A value <= 0 will run forever. 
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="-1"
+     * @parameter property="-1"
      * @readonly
      */
     protected String duration;
@@ -54,7 +54,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * The DOT File name used to generate the DOT diagram of the route definitions
      *
-     * @parameter expression="${project.build.directory}/site/cameldoc/routes.dot"
+     * @parameter property="${project.build.directory}/site/cameldoc/routes.dot"
      * @readonly
      */
     protected String outputDirectory;
@@ -62,7 +62,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * Allows the DOT file generation to be disabled
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      * @readonly
      */
     protected boolean dotEnabled;
@@ -70,7 +70,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * Allows the routes from multiple contexts to be aggregated into one DOT file (in addition
to the individual files)
      *
-     * @parameter expression="false"
+     * @parameter property="false"
      * @readonly
      */
     protected boolean dotAggregationEnabled;
@@ -78,21 +78,21 @@ public class EmbeddedMojo extends Abstra
     /**
      * The classpath based application context uri that spring wants to get.
      *
-     * @parameter expression="${camel.applicationContextUri}"
+     * @parameter property="camel.applicationContextUri"
      */
     protected String applicationContextUri;
     
     /**
      * The filesystem based application context uri that spring wants to get.
      *
-     * @parameter expression="${camel.fileApplicationContextUri}"
+     * @parameter property="camel.fileApplicationContextUri"
      */
     protected String fileApplicationContextUri;
 
     /**
      * Project classpath.
      *
-     * @parameter expression="${project.testClasspathElements}"
+     * @parameter property="project.testClasspathElements"
      * @required
      * @readonly
      */
@@ -101,7 +101,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      *            default-value="org.apache.camel.spring.Main"
      * @required
      */

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=1443596&r1=1443595&r2=1443596&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
Thu Feb  7 16:31:39 2013
@@ -73,7 +73,7 @@ public class RunMojo extends AbstractExe
     /**
      * The maven project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -84,7 +84,7 @@ public class RunMojo extends AbstractExe
      * milliseconds. A value <= 0 will run forever.
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="${camel.duration}"
+     * @parameter property="camel.duration"
      *            default-value="-1"
      *
      */
@@ -94,7 +94,7 @@ public class RunMojo extends AbstractExe
      * The DOT output directory name used to generate the DOT diagram of the
      * route definitions
      *
-     * @parameter expression="${project.build.directory}/site/cameldoc"
+     * @parameter property="${project.build.directory}/site/cameldoc"
      * @readonly
      */
     protected String dotDir;
@@ -102,21 +102,21 @@ public class RunMojo extends AbstractExe
     /**
      * Allows the DOT file generation to be enabled
      *
-     * @parameter expression="false"
+     * @parameter property="false"
      */
     protected boolean useDot;
 
     /**
      * Whether to log the classpath when starting
      *
-     * @parameter expression="false"
+     * @parameter property="false"
      */
     protected boolean logClasspath;
 
     /**
      * Whether to use Blueprint when running, instead of Spring
      *
-     * @parameter expression="${camel.blueprint}"
+     * @parameter property="camel.blueprint"
      *            default-value="false"
      */
     protected boolean useBlueprint;
@@ -124,7 +124,7 @@ public class RunMojo extends AbstractExe
     /**
      * Whether to use CDI when running, instead of Spring
      *
-     * @parameter expression="${camel.cdi}"
+     * @parameter property="camel.cdi"
      *            default-value="false"
      */
     protected boolean useCDI;
@@ -145,14 +145,14 @@ public class RunMojo extends AbstractExe
     private ArtifactMetadataSource metadataSource;
 
     /**
-     * @parameter expression="${localRepository}"
+     * @parameter property="localRepository"
      * @required
      * @readonly
      */
     private ArtifactRepository localRepository;
 
     /**
-     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @parameter property="project.remoteArtifactRepositories"
      */
     private List<?> remoteRepositories;
 
@@ -162,7 +162,7 @@ public class RunMojo extends AbstractExe
     private MavenProjectBuilder projectBuilder;
 
     /**
-     * @parameter expression="${plugin.artifacts}"
+     * @parameter property="plugin.artifacts"
      * @readonly
      */
     private List<Artifact> pluginDependencies;
@@ -170,7 +170,7 @@ public class RunMojo extends AbstractExe
     /**
      * Whether to enable the tracer or not
      *
-     * @parameter expression="${camel.trace}"
+     * @parameter property="camel.trace"
      *            default-value="false"
      * @required
      */
@@ -179,49 +179,49 @@ public class RunMojo extends AbstractExe
     /**
      * Output all routes to the specified XML file
      *
-     * @parameter expression="${camel.routesOutputFile}"
+     * @parameter property="camel.routesOutputFile"
      */
     private String routesOutputFile;    
     
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      */
     private String mainClass;
 
     /**
      * The basedPackages that spring java config want to gets.
      *
-     * @parameter expression="${camel.basedPackages}"
+     * @parameter property="camel.basedPackages"
      */
     private String basedPackages;
 
     /**
      * The configClasses that spring java config want to gets.
      *
-     * @parameter expression="${camel.configClasses}"
+     * @parameter property="camel.configClasses"
      */
     private String configClasses;
     
     /**
      * The classpath based application context uri that spring want to gets.
      *
-     * @parameter expression="${camel.applicationContextUri}"
+     * @parameter property="camel.applicationContextUri"
      */
     private String applicationContextUri;
 
     /**
      * The filesystem based application context uri that spring want to gets.
      *
-     * @parameter expression="${camel.fileApplicationContextUri}"
+     * @parameter property="camel.fileApplicationContextUri"
      */
     private String fileApplicationContextUri;
 
     /**
      * The class arguments.
      *
-     * @parameter expression="${camel.arguments}"
+     * @parameter property="camel.arguments"
      */
     private String[] arguments;
 
@@ -240,7 +240,7 @@ public class RunMojo extends AbstractExe
      * running after the mainclass terminates. Usefull for serverlike apps with
      * deamonthreads.
      *
-     * @parameter expression="${camel.keepAlive}" default-value="false"
+     * @parameter property="camel.keepAlive" default-value="false"
      */
     private boolean keepAlive;
 
@@ -248,7 +248,7 @@ public class RunMojo extends AbstractExe
      * Indicates if the project dependencies should be used when executing the
      * main class.
      *
-     * @parameter expression="${camel.includeProjectDependencies}"
+     * @parameter property="camel.includeProjectDependencies"
      *            default-value="true"
      */
     private boolean includeProjectDependencies;
@@ -261,7 +261,7 @@ public class RunMojo extends AbstractExe
      * using the csharp plugins only expects to see dotnet libraries as
      * dependencies.
      *
-     * @parameter expression="${camel.includePluginDependencies}"
+     * @parameter property="camel.includePluginDependencies"
      *            default-value="false"
      */
     private boolean includePluginDependencies;
@@ -294,7 +294,7 @@ public class RunMojo extends AbstractExe
      * {@link #stopUnresponsiveDaemonThreads} for further tuning.
      * </p>
      *
-     * @parameter expression="${camel.cleanupDaemonThreads} default-value="true"
+     * @parameter property="camel.cleanupDaemonThreads" default-value="true"
      */
     private boolean cleanupDaemonThreads;
 
@@ -315,7 +315,7 @@ public class RunMojo extends AbstractExe
      * future based on user feedback.
      * </p>
      *
-     * @parameter expression="${camel.daemonThreadJoinTimeout}"
+     * @parameter property="camel.daemonThreadJoinTimeout"
      *            default-value="15000"
      */
     private long daemonThreadJoinTimeout;
@@ -335,7 +335,7 @@ public class RunMojo extends AbstractExe
      * href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6336543">this
      * bug</a>.
      *
-     * @parameter expression="${camel.stopUnresponsiveDaemonThreads}
+     * @parameter property="camel.stopUnresponsiveDaemonThreads"
      *            default-value="false"
      */
     private boolean stopUnresponsiveDaemonThreads;
@@ -343,7 +343,7 @@ public class RunMojo extends AbstractExe
     /**
      * Deprecated this is not needed anymore.
      *
-     * @parameter expression="${camel.killAfter}" default-value="-1"
+     * @parameter property="camel.killAfter" default-value="-1"
      */
     private long killAfter;
 

Modified: camel/trunk/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageMojo.java
(original)
+++ camel/trunk/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageMojo.java
Thu Feb  7 16:31:39 2013
@@ -37,7 +37,7 @@ public class PackageMojo extends Abstrac
     /**
      * The maven project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -46,7 +46,7 @@ public class PackageMojo extends Abstrac
     /**
      * The output directory of classes
      *
-     * @parameter expression="${project.build.directory}/classes"
+     * @parameter property="${project.build.directory}/classes"
      * @readonly
      */
     protected File outDir;

Modified: camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
(original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
Thu Feb  7 16:31:39 2013
@@ -74,7 +74,7 @@ public class DotMojo extends AbstractMav
      * milliseconds. A value <= 0 will run forever.
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="2s"
+     * @parameter property="2s"
      */
     protected String duration;
 
@@ -82,7 +82,7 @@ public class DotMojo extends AbstractMav
      * Whether we should boot up camel with the jndi.properties file to
      * generate the DOT file
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      */
     protected boolean runCamel;
 
@@ -90,14 +90,14 @@ public class DotMojo extends AbstractMav
      * Should we try run the DOT executable on the generated .DOT file to
      * generate images
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      */
     protected boolean useDot;
 
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      *            default-value="org.apache.camel.guice.Main"
      * @required
      */
@@ -106,7 +106,7 @@ public class DotMojo extends AbstractMav
     /**
      * Reference to Maven 2 Project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -115,7 +115,7 @@ public class DotMojo extends AbstractMav
     /**
      * Base output directory.
      *
-     * @parameter expression="${project.build.directory}"
+     * @parameter property="project.build.directory"
      * @required
      */
     private File buildDirectory;
@@ -143,7 +143,7 @@ public class DotMojo extends AbstractMav
      * only if you install this program and set this property to the executable
      * dot (dot.exe on Win).
      *
-     * @parameter expression="dot"
+     * @parameter property="dot"
      */
     private String executable;
 

Modified: camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
(original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
Thu Feb  7 16:31:39 2013
@@ -45,7 +45,7 @@ public class EmbeddedMojo extends Abstra
      * A value <= 0 will run forever.
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="-1"
+     * @parameter property="-1"
      * @readonly
      */
     protected String duration;
@@ -53,7 +53,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * The DOT File name used to generate the DOT diagram of the route definitions
      *
-     * @parameter expression="${project.build.directory}/site/cameldoc/routes.dot"
+     * @parameter property="${project.build.directory}/site/cameldoc/routes.dot"
      * @readonly
      */
     protected String outputDirectory;
@@ -61,7 +61,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * Allows the DOT file generation to be disabled
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      * @readonly
      */
     protected boolean dotEnabled;
@@ -69,7 +69,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * Allows the routes from multiple contexts to be aggregated into one DOT file (in addition
to the individual files)
      *
-     * @parameter expression="false"
+     * @parameter property="false"
      * @readonly
      */
     protected boolean dotAggregationEnabled;
@@ -77,7 +77,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * Project classpath.
      *
-     * @parameter expression="${project.testClasspathElements}"
+     * @parameter property="project.testClasspathElements"
      * @required
      * @readonly
      */
@@ -86,7 +86,7 @@ public class EmbeddedMojo extends Abstra
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      *            default-value="org.apache.camel.guice.Main"
      * @required
      */

Modified: camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
(original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
Thu Feb  7 16:31:39 2013
@@ -74,7 +74,7 @@ public class RunMojo extends AbstractExe
     /**
      * The maven project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -85,7 +85,7 @@ public class RunMojo extends AbstractExe
      * milliseconds. A value <= 0 will run forever.
      * Adding a s indicates seconds - eg "5s" means 5 seconds.
      *
-     * @parameter expression="-1"
+     * @parameter property="-1"
      *
      */
     protected String duration;
@@ -94,7 +94,7 @@ public class RunMojo extends AbstractExe
      * The DOT output directory name used to generate the DOT diagram of the
      * route definitions
      *
-     * @parameter expression="${project.build.directory}/site/cameldoc"
+     * @parameter property="${project.build.directory}/site/cameldoc"
      * @readonly
      */
     protected String dotDir;
@@ -102,7 +102,7 @@ public class RunMojo extends AbstractExe
     /**
      * Allows the DOT file generation to be disabled
      *
-     * @parameter expression="true"
+     * @parameter property="true"
      * @readonly
      */
     protected boolean dotEnabled;
@@ -123,14 +123,14 @@ public class RunMojo extends AbstractExe
     private ArtifactMetadataSource metadataSource;
 
     /**
-     * @parameter expression="${localRepository}"
+     * @parameter property="localRepository"
      * @required
      * @readonly
      */
     private ArtifactRepository localRepository;
 
     /**
-     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @parameter property="project.remoteArtifactRepositories"
      */
     private List<?> remoteRepositories;
 
@@ -140,7 +140,7 @@ public class RunMojo extends AbstractExe
     private MavenProjectBuilder projectBuilder;
 
     /**
-     * @parameter expression="${plugin.artifacts}"
+     * @parameter property="plugin.artifacts"
      * @readonly
      */
     private List<Artifact> pluginDependencies;
@@ -148,7 +148,7 @@ public class RunMojo extends AbstractExe
     /**
      * Whether to enable the debugger or not
      *
-     * @parameter expression="${camel.debug}"
+     * @parameter property="camel.debug"
      *            default-value="false"
      * @required
      */
@@ -157,7 +157,7 @@ public class RunMojo extends AbstractExe
     /**
      * Whether to enable the tracer or not
      *
-     * @parameter expression="${camel.trace}"
+     * @parameter property="camel.trace"
      *            default-value="false"
      * @required
      */
@@ -166,14 +166,14 @@ public class RunMojo extends AbstractExe
     /**
      * Output all routes to the specified XML file
      *
-     * @parameter expression="${camel.routesOutputFile}"
+     * @parameter property="camel.routesOutputFile"
      */
     private String routesOutputFile;
 
     /**
      * The main class to execute.
      *
-     * @parameter expression="${camel.mainClass}"
+     * @parameter property="camel.mainClass"
      *            default-value="org.apache.camel.guice.Main"
      * @required
      */
@@ -182,7 +182,7 @@ public class RunMojo extends AbstractExe
     /**
      * The class arguments.
      *
-     * @parameter expression="${camel.arguments}"
+     * @parameter property="camel.arguments"
      */
     private String[] arguments;
 
@@ -201,7 +201,7 @@ public class RunMojo extends AbstractExe
      * running after the mainclass terminates. Usefull for serverlike apps with
      * deamonthreads.
      *
-     * @parameter expression="${camel.keepAlive}" default-value="false"
+     * @parameter property="camel.keepAlive" default-value="false"
      */
     private boolean keepAlive;
 
@@ -209,7 +209,7 @@ public class RunMojo extends AbstractExe
      * Indicates if the project dependencies should be used when executing the
      * main class.
      *
-     * @parameter expression="${camel.includeProjectDependencies}"
+     * @parameter property="camel.includeProjectDependencies"
      *            default-value="true"
      */
     private boolean includeProjectDependencies;
@@ -222,7 +222,7 @@ public class RunMojo extends AbstractExe
      * using the csharp plugins only expects to see dotnet libraries as
      * dependencies.
      *
-     * @parameter expression="${camel.includePluginDependencies}"
+     * @parameter property="camel.includePluginDependencies"
      *            default-value="false"
      */
     private boolean includePluginDependencies;
@@ -255,7 +255,7 @@ public class RunMojo extends AbstractExe
      * {@link #stopUnresponsiveDaemonThreads} for further tuning.
      * </p>
      *
-     * @parameter expression="${camel.cleanupDaemonThreads} default-value="true"
+     * @parameter property="camel.cleanupDaemonThreads" default-value="true"
      */
     private boolean cleanupDaemonThreads;
 
@@ -276,7 +276,7 @@ public class RunMojo extends AbstractExe
      * future based on user feedback.
      * </p>
      *
-     * @parameter expression="${camel.daemonThreadJoinTimeout}"
+     * @parameter property="camel.daemonThreadJoinTimeout"
      *            default-value="15000"
      */
     private long daemonThreadJoinTimeout;
@@ -296,7 +296,7 @@ public class RunMojo extends AbstractExe
      * href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6336543">this
      * bug</a>.
      *
-     * @parameter expression="${camel.stopUnresponsiveDaemonThreads}
+     * @parameter property="camel.stopUnresponsiveDaemonThreads"
      *            default-value="false"
      */
     private boolean stopUnresponsiveDaemonThreads;
@@ -304,7 +304,7 @@ public class RunMojo extends AbstractExe
     /**
      * Deprecated this is not needed anymore.
      *
-     * @parameter expression="${camel.killAfter}" default-value="-1"
+     * @parameter property="camel.killAfter" default-value="-1"
      */
     private long killAfter;
 

Modified: camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java?rev=1443596&r1=1443595&r2=1443596&view=diff
==============================================================================
--- camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
(original)
+++ camel/trunk/tooling/maven/maven-html-to-pdf/src/main/java/org/apache/camel/maven/HtmlToPdfMojo.java
Thu Feb  7 16:31:39 2013
@@ -58,7 +58,7 @@ public class HtmlToPdfMojo extends Abstr
     /**
      * The URL to the confluence page to convert.
      *
-     * @parameter expression="${page}"
+     * @parameter property="page"
      * @required
      */
     private String page;
@@ -66,7 +66,7 @@ public class HtmlToPdfMojo extends Abstr
     /**
      * The output file name for the pdf.
      *
-     * @parameter expression="${pdf}"
+     * @parameter property="pdf"
      *            default-value="${project.build.directory}/site/manual/${project.artifactId}-${project.version}.pdf"
      */
     private String pdf;
@@ -136,7 +136,7 @@ public class HtmlToPdfMojo extends Abstr
     /**
      * The maven project.
      *
-     * @parameter expression="${project}"
+     * @parameter property="project"
      * @required
      * @readonly
      */
@@ -298,7 +298,7 @@ public class HtmlToPdfMojo extends Abstr
         String previousTransformerFactoryClassName = null;
         if (transformerFactoryClassName != null) {
             previousTransformerFactoryClassName = System.setProperty(XSLT_SYSTEM_PROPERTY_KEY,
transformerFactoryClassName);
-            getLog().info("Set the XSL transformer factory class name to be '" + transformerFactoryClassName
+ "'");
+            getLog().info("Set the XSLT factory class name to be '" + transformerFactoryClassName
+ "'");
         }
 
         String contentTag = "<div class=\"" + contentDivClass + "\"";
@@ -328,11 +328,11 @@ public class HtmlToPdfMojo extends Abstr
                 if (previousTransformerFactoryClassName == null) {
                     // remove the set system property
                     System.getProperties().remove(XSLT_SYSTEM_PROPERTY_KEY);
-                    getLog().info("Removed the set XSL transformer factory class name '"
+ transformerFactoryClassName + "' from the system properties");
+                    getLog().info("Removed the set XSLT factory class name '" + transformerFactoryClassName
+ "' from the system properties");
                 } else {
                     // reset the previous system property value to whatever it was before
                     System.setProperty(XSLT_SYSTEM_PROPERTY_KEY, previousTransformerFactoryClassName);
-                    getLog().info("Resetted the XSL transformer factory class name to be
'" + previousTransformerFactoryClassName + "'");
+                    getLog().info("Resetted the XSLT factory class name to be '" + previousTransformerFactoryClassName
+ "'");
                 }
             }
         }



Mime
View raw message