You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2014/06/27 23:06:18 UTC
svn commit: r1606232 - in
/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck:
AbstractTCKMojo.java Enhance.java InstallSchema.java RunTCK.java
Author: mbo
Date: Fri Jun 27 21:06:17 2014
New Revision: 1606232
URL: http://svn.apache.org/r1606232
Log:
JDO-731 Warnings when building exectck
Modified:
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java?rev=1606232&r1=1606231&r2=1606232&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java Fri Jun 27 21:06:17 2014
@@ -31,7 +31,7 @@ public abstract class AbstractTCKMojo ex
/**
* Location of TCK generated output.
- * @parameter expression="${project.build.directory}"
+ * @parameter property="project.build.directory"
* default-value="${basedir}/target"
* @required
*/
@@ -39,7 +39,7 @@ public abstract class AbstractTCKMojo ex
/**
* Location of the logs directory.
- * @parameter expression="${project.log.directory}"
+ * @parameter property="project.log.directory"
* default-value="${project.build.directory}/logs"
* @required
*/
@@ -47,7 +47,7 @@ public abstract class AbstractTCKMojo ex
/**
* Location of the configuration directory.
- * @parameter expression="${project.conf.directory}"
+ * @parameter property="project.conf.directory"
* default-value="${basedir}/src/conf"
* @required
*/
@@ -55,7 +55,7 @@ public abstract class AbstractTCKMojo ex
/**
* Location of the configuration directory.
- * @parameter expression="${project.sql.directory}"
+ * @parameter property="project.sql.directory"
* default-value="${basedir}/src/sql"
* @required
*/
@@ -73,7 +73,7 @@ public abstract class AbstractTCKMojo ex
/**
* List of configuration files, each describing a test configuration.
* Allows command line override of configured cfgs value.
- * @parameter expression="${jdo.tck.cfglist}"
+ * @parameter property="jdo.tck.cfglist"
* @optional
*/
protected String cfgList;
@@ -81,7 +81,7 @@ public abstract class AbstractTCKMojo ex
/**
* List of databases to run tests under.
* Currently only derby is supported.
- * @parameter expression="${jdo.tck.dblist}"
+ * @parameter property="jdo.tck.dblist"
* default-value="derby"
* @required
*/
@@ -91,7 +91,7 @@ public abstract class AbstractTCKMojo ex
/**
* List of identity types to be tested.
- * @parameter expression="${jdo.tck.identitytypes}"
+ * @parameter property="jdo.tck.identitytypes"
* default-value="applicationidentity datastoreidentity"
* @required
*/
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java?rev=1606232&r1=1606231&r2=1606232&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java Fri Jun 27 21:06:17 2014
@@ -35,28 +35,28 @@ public class Enhance extends AbstractMoj
};
/**
* Location of TCK generated output.
- * @parameter expression="${jdo.tck.doEnhance}"
+ * @parameter property="jdo.tck.doEnhance"
* default-value="true"
* @required
*/
private boolean doEnhance;
/**
* Root of the TCK source installation.
- * @parameter expression="${project.src.directory}"
+ * @parameter property="project.src.directory"
* default-value="${basedir}/src"
* @required
*/
private String srcDirectory;
/**
* Location of the logs directory.
- * @parameter expression="${project.log.directory}"
+ * @parameter property="project.log.directory"
* default-value="${project.build.directory}/logs"
* @required
*/
private File logsDirectory;
/**
* Location of TCK generated output.
- * @parameter expression="${project.build.directory}"
+ * @parameter property="project.build.directory"
* default-value="${basedir}/target"
* @required
*/
@@ -64,35 +64,35 @@ public class Enhance extends AbstractMoj
/**
* Implementation to be tested (jdori or iut).
* Any value other than "jdori" will test an appropriately configured IUT
- * @parameter expression="${jdo.tck.impl}"
+ * @parameter property="jdo.tck.impl"
* default-value="jdori"
* @required
*/
private String impl;
/**
* Location of implementation log file.
- * @parameter expression="${jdo.tck.impl.logfile}"
+ * @parameter property="jdo.tck.impl.logfile"
* default-value="${user.dir}/datanucleus.txt"
* @required
*/
private String implLogFile;
/**
* Location of jar files for implementation under test.
- * @parameter expression="${project.lib.iut.directory}"
+ * @parameter property="project.lib.iut.directory"
* default-value="${basedir}/../lib/iut"
* @required
*/
private String iutLibsDirectory;
/**
* Location of jar files for implementation under test.
- * @parameter expression="${project.lib.iut.directory}"
+ * @parameter property="project.lib.iut.directory"
* default-value="${basedir}/../lib/jdori"
* @required
*/
private String jdoriLibsDirectory;
/**
* List of identity types to be tested.
- * @parameter expression="${jdo.tck.identitytypes}"
+ * @parameter property="jdo.tck.identitytypes"
* default-value="applicationidentity datastoreidentity"
* @required
*/
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java?rev=1606232&r1=1606231&r2=1606232&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java Fri Jun 27 21:06:17 2014
@@ -34,7 +34,7 @@ public class InstallSchema extends Abstr
/**
* Location of TCK generated output.
- * @parameter expression="${jdo.tck.doInstallSchema}"
+ * @parameter property="jdo.tck.doInstallSchema"
* default-value="true"
* @required
*/
Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java?rev=1606232&r1=1606231&r2=1606232&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java Fri Jun 27 21:06:17 2014
@@ -46,7 +46,7 @@ public class RunTCK extends AbstractTCKM
/**
* To skip running of TCK, set to false.
- * @parameter expression="${jdo.tck.doRunTCK}"
+ * @parameter property="jdo.tck.doRunTCK"
* default-value=true
* @required
*/
@@ -54,7 +54,7 @@ public class RunTCK extends AbstractTCKM
/**
* To run the RunTCK plugin goal in verbose mode.
- * @parameter expression="${jdo.tck.runTCKVerbose}"
+ * @parameter property="jdo.tck.runTCKVerbose"
* default-value=false
* @required
*/
@@ -62,7 +62,7 @@ public class RunTCK extends AbstractTCKM
/**
* Run the TCK in a debugger.
- * @parameter expression="${jdo.tck.debugTCK}"
+ * @parameter property="jdo.tck.debugTCK"
* default-value=false
* @required
*/
@@ -71,7 +71,7 @@ public class RunTCK extends AbstractTCKM
/**
* Implementation to be tested (jdori or iut).
* Any value other than "jdori" will test an appropriately configured IUT
- * @parameter expression="${jdo.tck.impl}"
+ * @parameter property="jdo.tck.impl"
* default-value="jdori"
* @required
*/
@@ -79,7 +79,7 @@ public class RunTCK extends AbstractTCKM
/**
* Location of third party libraries such as JNDI.
- * @parameter expression="${project.lib.ext.directory}"
+ * @parameter property="project.lib.ext.directory"
* default-value="${basedir}/../lib/ext"
* @required
*/
@@ -87,7 +87,7 @@ public class RunTCK extends AbstractTCKM
/**
* Location of implementation log file.
- * @parameter expression="${jdo.tck.impl.logfile}"
+ * @parameter property="jdo.tck.impl.logfile"
* default-value="${user.dir}/datanucleus.txt"
* @required
*/
@@ -95,21 +95,21 @@ public class RunTCK extends AbstractTCKM
/**
* Location of jar files for implementation under test.
- * @parameter expression="${project.lib.iut.directory}"
+ * @parameter property="project.lib.iut.directory"
* default-value="${basedir}/../lib/iut"
* @required
*/
private String iutLibsDirectory;
/**
* Location of jar files for implementation under test.
- * @parameter expression="${project.lib.iut.directory}"
+ * @parameter property="project.lib.iut.directory"
* default-value="${basedir}/../lib/jdori"
* @required
*/
private String jdoriLibsDirectory;
/**
* Name of file in src/conf containing pmf properties.
- * @parameter expression="${jdo.tck.pmfproperties}"
+ * @parameter property="jdo.tck.pmfproperties"
* default-value="jdori-pmf.properties"
* @optional
*/
@@ -118,7 +118,7 @@ public class RunTCK extends AbstractTCKM
/**
* Name of file in src/conf containing property jdo.tck.exclude,
* whose value is a list of files to be excluded from testing.
- * @parameter expression="${jdo.tck.excludefile}"
+ * @parameter property="jdo.tck.excludefile"
* default-value="exclude.list"
* @required
*/
@@ -126,35 +126,35 @@ public class RunTCK extends AbstractTCKM
/**
* Run the TCK tests in verbose mode.
- * @parameter expression="${jdo.tck.verbose}
+ * @parameter property="jdo.tck.verbose"
* default-value="false"
* @optional
*/
private String verbose;
/**
* To retain test output for debugging, set to false.
- * @parameter expression="${jdo.tck.cleanupaftertest}
+ * @parameter property="jdo.tck.cleanupaftertest"
* default-value="true"
* @optional
*/
private String cleanupaftertest;
/**
* Properties to use in accessing database.
- * @parameter expression="${database.runtck.sysproperties}"
+ * @parameter property="database.runtck.sysproperties"
* default-value="-Dderby.system.home=${basedir}/target/database/derby"
* @optional
*/
private String dbproperties; // NOTE: only allows for one db
/**
* Properties to use in accessing database.
- * @parameter expression="${jdo.tck.signaturefile}"
+ * @parameter property="jdo.tck.signaturefile"
* default-value="${basedir}/src/conf/jdo-3_1-signatures.txt"
* @optional
*/
private String signaturefile;
/**
* JVM properties.
- * @parameter expression="${jdo.tck.jvmproperties}"
+ * @parameter property="jdo.tck.jvmproperties"
* default-value="-Xmx512m"
* @optional
*/
@@ -162,7 +162,7 @@ public class RunTCK extends AbstractTCKM
/**
* User-supplied arguments for debug directives.
- * @parameter expression="${jdo.tck.debug.jvmargs}"
+ * @parameter property="jdo.tck.debug.jvmargs"
* default-value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${jdo.tck.debug.port}"
* @optional
*/
@@ -170,7 +170,7 @@ public class RunTCK extends AbstractTCKM
/**
* Class used to run a batch of tests.
- * @parameter expression="${jdo.tck.testrunnerclass}"
+ * @parameter property="jdo.tck.testrunnerclass"
* default-value="org.apache.jdo.tck.util.BatchTestRunner"
* @required
*/
@@ -178,7 +178,7 @@ public class RunTCK extends AbstractTCKM
/**
* Class used to output test result and configuration information.
- * @parameter expression="${jdo.tck.resultprinterclass}"
+ * @parameter property="jdo.tck.resultprinterclass"
* default-value="org.apache.jdo.tck.util.BatchResultPrinter"
* @required
*/