Hi Dan, I think some of the values have been corrected wrong.With the
introduction of property as a replacement of expression it should become clear
when to use default-value and when property.A property is the key to use on the
commandline ( -Dkey=value ) So @parameter
property="project.compileClasspathElements" should be @parameter
default-value="${project.compileClasspathElements}"probably with
readonly="true" and required="true" too Same counts for "plugin" and "project"
Robert From: [email protected]
To: [email protected]
Date: Sun, 24 Feb 2013 13:51:33 -0600
Subject: [mojo-scm] [17960]
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo: [ 00000] remove
deprecated warning after uprade to latest mojo-parent
[17960] trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo: [00000]
remove deprecated warning after uprade to latest mojo-parent
Revision 17960
Author dantran
Date 2013-02-24 13:51:33 -0600 (Sun, 24 Feb 2013)
Log Message
[00000] remove deprecated warning after uprade to latest mojo-parent
Modified Paths
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/chm2html/Chm2WebMojo.java
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractDitaMojo.java
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractProjectMojo.java
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaEclipseMojo.java
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaRunMojo.java
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaVersionMojo.java
Diff
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/chm2html/Chm2WebMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/chm2html/Chm2WebMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/chm2html/Chm2WebMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -38,7 +38,7 @@
{
/**
- * @parameter expression="${chm2web.exe}"
+ * @parameter property="chm2web.exe"
* default-value="c:\\Program Files\\A!K Research
Labs\\chm2web\\chm2web.exe"
* @since 1.0-beta-1
*/
@@ -47,7 +47,7 @@
/**
* Allow skipping the conversion when chm2web is not available.
*
- * @parameter expression="${chm2web.ignoreIfExeNotExist}"
default-value="false"
+ * @parameter property="chm2web.ignoreIfExeNotExist" default-value="false"
* @since 1.0-beta-1
*/
private boolean ignoreIfChm2WebNotExist;
@@ -55,7 +55,7 @@
/**
* Chm2Web configuration file
*
- * @parameter expression="${chm2web.descriptor}"
+ * @parameter property="chm2web.descriptor"
*
default-value="${basedir}/src/main/chm2web/${project.artifactId}.chm2web"
* @since 1.0-beta-1
*/
@@ -65,7 +65,7 @@
* Controls whether this plugin tries to archive the output directory and
attach archive to the
* project.
*
- * @parameter expression="${chm2web.attach}" default-value="false"
+ * @parameter property="chm2web.attach" default-value="false"
* @since 1.0-beta-1
*/
private boolean attach = false;
@@ -74,7 +74,7 @@
* Chm2Web output directory. Must match with the output directory found in
your chm2web's
* descriptor file.
*
- * @parameter expression="${chm2web.outputDirectory}"
+ * @parameter property="chm2web.outputDirectory"
* default-value="${project.build.directory}/chm2web"
* @since 1.0-beta-1
*/
@@ -83,7 +83,7 @@
/**
* Output file classifier to be attached to the project.
*
- * @parameter expression="${chm2web.attachClassifier}"
+ * @parameter property="chm2web.attachClassifier"
* @since 1.0-beta-1
*/
private String attachClassifier;
@@ -91,7 +91,7 @@
/**
* Output file extension to be attached to the project.
*
- * @parameter expression="${chm2web.attachType}" default-value="jar"
+ * @parameter property="chm2web.attachType" default-value="jar"
* @since 1.0-beta-1
*/
private String attachType;
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractDitaMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractDitaMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractDitaMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -43,7 +43,7 @@
/**
* Add jar files under DITA Open Toolkit's lib directory to execution
classpath
*
- * @parameter expression="${dita.useDitaClasspath}" default-value="true"
+ * @parameter property="dita.useDitaClasspath" default-value="true"
* @since 1.0-beta-1
*/
protected boolean useDitaClasspath;
@@ -76,14 +76,14 @@
/**
* Internal. Compile time project dependencies to be added to Ant's
classpath
- * @parameter expression="${project.compileClasspathElements}"
+ * @parameter property="project.compileClasspathElements"
* @since 1.0-beta-1
*/
private List<String> classpathElements;
/**
* Internal. Plugin's dependencies to be added to Ant's classpath
- * @parameter expression="${plugin}"
+ * @parameter property="plugin"
* @since 1.0-beta-4
*/
private PluginDescriptor plugin;
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractProjectMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractProjectMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/AbstractProjectMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -47,7 +47,7 @@
/**
* Skip the execution
*
- * @parameter expression="${dita.skip}" default-value="false"
+ * @parameter property="dita.skip" default-value="false"
* @since 1.0-beta-1
*/
protected boolean skip;
@@ -55,7 +55,7 @@
/**
* Internal
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @readonly
* @since 1.0-beta-1
*/
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaEclipseMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaEclipseMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaEclipseMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -48,7 +48,7 @@
/**
* If given, will be added to Ant command line
*
- * @parameter expression="${dita.projectName}"
default-value="${project.artifactId}"
+ * @parameter property="dita.projectName"
default-value="${project.artifactId}"
* @since since 1.0-beta-1
*
*/
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaRunMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaRunMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaRunMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -68,7 +68,7 @@
/**
* Use DITA Open Toolkit's tools/ant
*
- * @parameter expression="${dita.useDitaAnt}" default-value="true"
+ * @parameter property="dita.useDitaAnt" default-value="true"
* @since since 1.0-beta-1
*
*/
@@ -78,7 +78,7 @@
* Point to Ant installation directory. If given, it will override
<i>useDitaAnt</i> and
* ${env.ANT_HOME}
*
- * @parameter expression="${dita.antHome}"
+ * @parameter property="dita.antHome"
* @since since 1.0-beta-1
*
*/
@@ -87,7 +87,7 @@
/**
* If given, will be added to Ant command line. Use this for trouble
shooting purpose
*
- * @parameter expression="${dita.antArguments}"
+ * @parameter property="dita.antArguments"
* @since since 1.0-beta-1
*
*/
@@ -97,7 +97,7 @@
* Equivalent with ANT_OPTS environment. This parameter overrides the
current env.ANT_OPTS if given.
* Typical usage is to setup JVM's heap space ( example -Xmx500m )
*
- * @parameter expression="${dita.antOpts}"
+ * @parameter property="dita.antOpts"
* @since since 1.0-beta-1
*
*/
@@ -107,7 +107,7 @@
* Controls whether this goal tries to compress the output directory and
attach compressed
* output file to the project for install and deploy purposes.
*
- * @parameter expression="${dita.attach}" default-value="false"
+ * @parameter property="dita.attach" default-value="false"
* @since since 1.0-beta-1
*/
private boolean attach = false;
@@ -115,7 +115,7 @@
/**
* Output file classifier to be attached to the project.
*
- * @parameter expression="${dita.attachClassifier}"
+ * @parameter property="dita.attachClassifier"
* @since since 1.0-beta-1
*/
private String attachClassifier;
@@ -124,7 +124,7 @@
* Output file extension to be attached to the project. When transtype is
one of the pdf types or
* <i>htmlhelp</i>, the attachType will be hard coded to <i>pdf</i> and
<i>chm</i> respectively.
*
- * @parameter expression="${dita.attachType}" default-value="jar"
+ * @parameter property="dita.attachType" default-value="jar"
* @since since 1.0-beta-1
*/
private String attachType;
Modified:
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaVersionMojo.java
(17959 => 17960)
---
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaVersionMojo.java
2013-02-24 19:40:28 UTC (rev 17959)
+++
trunk/mojo/dita-maven-plugin/src/main/java/org/codehaus/mojo/dita/DitaVersionMojo.java
2013-02-24 19:51:33 UTC (rev 17960)
@@ -45,7 +45,7 @@
/**
* Maven project property name to store custom version value
*
- * @parameter expression="${dita.versionName}"
default-value="dita.custom.version"
+ * @parameter property="dita.versionName"
default-value="dita.custom.version"
* @since 1.0-beta-1
*
*/
@@ -54,7 +54,7 @@
/**
* Display DITA Open Toolkit's built-in version
*
- * @parameter expression="${dita.displayDitaOTVersion}"
default-value="true"
+ * @parameter property="dita.displayDitaOTVersion" default-value="true"
* @since 1.0-beta-1
*
*/
@@ -63,7 +63,7 @@
/**
* Relative path to DITA-OT custom version properties file path
*
- * @parameter expression="${dita.displayDitaOTVersion}"
default-value="custom.version.properties"
+ * @parameter property="dita.displayDitaOTVersion"
default-value="custom.version.properties"
* @since 1.0-beta-1
*
*/
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
