db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r1139148 - in /db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck: Enhance.java Help.java RunTCK.java
Date Fri, 24 Jun 2011 03:31:10 GMT
Author: mcaisse
Date: Fri Jun 24 03:31:10 2011
New Revision: 1139148

URL: http://svn.apache.org/viewvc?rev=1139148&view=rev
Log:
aJDO-647 - Fix multiple enhance, runonce running twice, typo in help doc.

Modified:
    db/jdo/trunk/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
    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

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=1139148&r1=1139147&r2=1139148&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 24 03:31:10
2011
@@ -123,6 +123,8 @@ public class Enhance extends AbstractMoj
         int startIdx = -1;
         Iterator<File> fi = null;
         String[] classArray = new String[10];
+        String enhancedIdDirName = null;
+        ArrayList<String> classes = null;
 
         // Copy metadata from src to enhanced
         for (String idtype : idtypes) {
@@ -162,8 +164,8 @@ public class Enhance extends AbstractMoj
                 String[] extensions = {"class"};
                 fromDirName = buildDirectory + File.separator
                         + "classes" + File.separator;
-                String enhancedIdDirName = enhancedDirName + idtype + File.separator;
-                ArrayList<String> classes = new ArrayList<String>();
+                enhancedIdDirName = enhancedDirName + idtype + File.separator;
+                classes = new ArrayList<String>();
                 for (String pcPkgName : pcPkgNames) {
                     // iterator over list of abs name of class files in target/classes
                     fi = FileUtils.iterateFiles(
@@ -184,7 +186,7 @@ public class Enhance extends AbstractMoj
                         }
                     }
                 }
-
+            }
                 // Enhance classes
 
                 URL[] classPathURLs = new URL[2];
@@ -212,10 +214,9 @@ public class Enhance extends AbstractMoj
                 enhancer.setClassLoader(loader);
                 String[] classArr = classes.toArray(classArray);
                 enhancer.addClasses(classArr);
-                System.out.println("Enhancing classes in " +
-                        srcDirectory + File.separator + srcDir);
+                System.out.println("Enhancing classes for identity type " +
+                        idtype);
                 enhancer.enhance();
-            }
         }
     }
 }

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=1139148&r1=1139147&r2=1139148&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 Fri Jun 24 03:31:10
2011
@@ -37,7 +37,7 @@ public class Help extends AbstractMojo{
         msg.append("  in the current test configurations.\n");
         msg.append("* enhance\n");
         msg.append("  Enhances classes. Classes must first be compiled (mvn compile).\n");
-        msg.append("* runTCK\n");
+        msg.append("* runtck\n");
         msg.append("  Runs the JDO Technology Compatibility Kit. Schema must first be installed
and classes enhanced.\n");
         msg.append("\nPARAMETERS\n");
         msg.append("To set parameters from the command line, \n  use the -D option and the
parameter name.\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=1139148&r1=1139147&r2=1139148&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 24 03:31:10
2011
@@ -413,7 +413,7 @@ public class RunTCK extends AbstractMojo
                     propsString.add("-Djdo.tck.schemaname=" + idtype + mapping);
                     propsString.add("-Djdo.tck.cfg=" + cfg);
 
-                    runonce = getTrimmedPropertyValue(props, "runonce");
+                    runonce = getTrimmedPropertyValue(props, "runOnce");
                     runonce = (runonce == null) ? "false" : runonce;
 
                     // Add Mapping and schemaname to properties file
@@ -459,6 +459,7 @@ public class RunTCK extends AbstractMojo
                     if (runonce.equals("true") && alreadyran) {
                         continue;
                     }
+                    System.out.println("runonce is " + runonce);
                     result = (new Utilities()).invokeTest(command);
 
                     if (runtckVerbose) {



Mime
View raw message