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 mc...@apache.org on 2011/06/15 05:03:55 UTC

svn commit: r1135906 - in /db/jdo/trunk: exectck/src/main/java/org/apache/jdo/exectck/Help.java exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java tck/pom.xml

Author: mcaisse
Date: Wed Jun 15 03:03:55 2011
New Revision: 1135906

URL: http://svn.apache.org/viewvc?rev=1135906&view=rev
Log:
JDO-647 - Fix problems with setting properties on command line, help documentation

Modified:
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
    db/jdo/trunk/tck/pom.xml

Modified: db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java?rev=1135906&r1=1135905&r2=1135906&view=diff
==============================================================================
--- db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java (original)
+++ db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Help.java Wed Jun 15 03:03:55 2011
@@ -55,14 +55,17 @@ public class Help extends AbstractMojo{
         msg.append("  Default value is \"applicationidentity datastoreidentity\"\n");
         msg.append("* project.lib.iut.directory\n");
         msg.append("  Location of implementation jar files. Default: ${basedir}/../lib/iut\n");
-        msg.append("* doInstallSchema\n");
+        msg.append("* jdo.tck.doInstallSchema\n");
         msg.append("  Setting this parameter to false will bypass schema installation.\n");
-        msg.append("* doEnhance\n");
+        msg.append("* jdo.tck.doEnhance\n");
         msg.append("  Setting this parameter to false will bypass enhancement.\n");
-        msg.append("* doRunTCK\n");
+        msg.append("* jdo.tck.doRunTCK\n");
         msg.append("  Setting this parameter to false will bypass running the TCK.\n");
+        msg.append("* jdo.tck.runTCKVerbose\n");
+        msg.append("  Setting this parameter to true will display test progress and"
+                + "error output while the TCK is running.\n");
         msg.append("\n  To run the TCK on an implementation under test, \n"
-                + "      place all required jars and their dependencies in lib/iut"
+                + "      place all required jars and their dependencies in lib/iut\n"
                 + "      and set jdo.tck.impl to iut:\n");
         msg.append("     mvn integration-test -D jdo.tck.impl=\"iut\"\n\n");
         msg.append("\n END EXECTCK HELP INFORMATION\n");

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=1135906&r1=1135905&r2=1135906&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 Wed Jun 15 03:03:55 2011
@@ -41,7 +41,7 @@ public class RunTCK extends AbstractMojo
     private boolean doRunTCK;
     /**
      * To run the RunTCK plugin goal in verbose mode.
-     * @parameter expression="${jdo.tck.doRunTCK}"
+     * @parameter expression="${jdo.tck.runTCKVerbose}"
      *      default-value=false
      * @required
      */

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1135906&r1=1135905&r2=1135906&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Wed Jun 15 03:03:55 2011
@@ -63,15 +63,10 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <doInstallSchema>true</doInstallSchema>
-                    <doEnhance>true</doEnhance>
-                    <doRunTCK>true</doRunTCK>
                     <pmfProperties>jdori-pmf.properties</pmfProperties>
                     <verbose>true</verbose>
-                    <runtckVerbose>true</runtckVerbose>
                     <debugTCK>false</debugTCK>
                     <cleanupaftertest>true</cleanupaftertest>
-                    <identitytypes>applicationidentity datastoreidentity</identitytypes>
                     <dbproperties>-Dderby.system.home=${basedir}/target/database/derby</dbproperties>
                     <signaturefile>${basedir}/src/conf/jdo-3_1-signatures.txt</signaturefile>
                     <cfgs>