db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r1050741 - in /db/jdo/trunk: exectck/pom.xml exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java tck/pom.xml
Date Sun, 19 Dec 2010 00:28:21 GMT
Author: mcaisse
Date: Sun Dec 19 00:28:20 2010
New Revision: 1050741

URL: http://svn.apache.org/viewvc?rev=1050741&view=rev
Log:
JDO-647 

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

Modified: db/jdo/trunk/exectck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/exectck/pom.xml?rev=1050741&r1=1050740&r2=1050741&view=diff
==============================================================================
--- db/jdo/trunk/exectck/pom.xml (original)
+++ db/jdo/trunk/exectck/pom.xml Sun Dec 19 00:28:20 2010
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>2.2.0-m3</version>
+            <version>2.2.0-release</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>2.2.0-m3</version>
+            <version>2.2.0-release</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jpa</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

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=1050741&r1=1050740&r2=1050741&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 Sun Dec 19 00:28:20
2010
@@ -206,6 +206,16 @@ public class RunTCK extends AbstractMojo
      */
     private String resultPrinterClass;
 
+    /**
+     * Helper method returning the trimmed value of the specified property.
+     * @param props the Properties object
+     * @param ke the key of the property to be returned
+     * @return the trimmed property value or the empty string if the property is not defined.
+     */
+    private String getTrimmedPropertyValue (Properties props, String key) {
+        String value = props.getProperty(key);
+        return value == null ? "" : value.trim();
+    }
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
 
@@ -257,7 +267,7 @@ public class RunTCK extends AbstractMojo
                 + "classes" + File.separator + pmfProperties);
         String excludeFile = confDirectory + File.separator + exclude;
         propsString.add("-Djdo.tck.exclude="
-                + PropertyUtils.getProperties(excludeFile).getProperty("jdo.tck.exclude"));
+                + getTrimmedPropertyValue(PropertyUtils.getProperties(excludeFile), "jdo.tck.exclude"));
 
         // Create configuration log directory
         String timestamp = Utilities.now();
@@ -345,23 +355,23 @@ public class RunTCK extends AbstractMojo
                     props = PropertyUtils.getProperties(confDirectory
                             + File.separator + cfg);
                     propsString.add("-Djdo.tck.testdata="
-                            + props.getProperty("jdo.tck.testdata"));
+                            + getTrimmedPropertyValue(props, "jdo.tck.testdata"));
                     propsString.add("-Djdo.tck.standarddata="
-                            + props.getProperty("jdo.tck.standarddata"));
+                            + getTrimmedPropertyValue(props, "jdo.tck.standarddata"));
                     propsString.add("-Djdo.tck.mapping.companyfactory="
-                            + props.getProperty("jdo.tck.mapping.companyfactory"));
+                            + getTrimmedPropertyValue(props, "jdo.tck.mapping.companyfactory"));
 //                    propsString.append("-Djdo.tck.description=\"" +
 //                            props.getProperty("jdo.tck.description") + "\"");
                     propsString.add("-Djdo.tck.requiredOptions="
-                            + props.getProperty("jdo.tck.requiredOptions"));
+                            + getTrimmedPropertyValue(props, "jdo.tck.requiredOptions"));
                     propsString.add("-Djdo.tck.signaturefile="
                             + signaturefile);
-                    String mapping = props.getProperty("jdo.tck.mapping");
+                    String mapping = getTrimmedPropertyValue(props, "jdo.tck.mapping");
                     if (mapping == null) {
                         throw new MojoExecutionException(
                                 "Could not find mapping value in conf file: " + cfg);
                     }
-                    String classes = props.getProperty("jdo.tck.classes");
+                    String classes = getTrimmedPropertyValue(props, "jdo.tck.classes");
                     if (classes == null) {
                         throw new MojoExecutionException(
                                 "Could not find classes value in conf file: " + cfg);
@@ -372,7 +382,7 @@ public class RunTCK extends AbstractMojo
                     propsString.add("-Djdo.tck.schemaname=" + idtype + mapping);
                     propsString.add("-Djdo.tck.cfg=" + cfg);
 
-                    runonce = props.getProperty("runonce");
+                    runonce = getTrimmedPropertyValue(props, "runonce");
                     runonce = (runonce == null) ? "false" : runonce;
 
                     // Add Mapping and schemaname to properties file

Modified: db/jdo/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/pom.xml?rev=1050741&r1=1050740&r2=1050741&view=diff
==============================================================================
--- db/jdo/trunk/tck/pom.xml (original)
+++ db/jdo/trunk/tck/pom.xml Sun Dec 19 00:28:20 2010
@@ -54,16 +54,16 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <doInstallSchema>false</doInstallSchema>
-                    <doEnhance>false</doEnhance>
+                    <doInstallSchema>true</doInstallSchema>
+                    <doEnhance>true</doEnhance>
                     <doRunTCK>true</doRunTCK>
                     <impl>jdori</impl>
                     <pmfProperties>jdori-pmf.properties</pmfProperties>
                     <verbose>true</verbose>
-                    <runtckVerbose>true</runtckVerbose>
+                    <runtckVerbose>false</runtckVerbose>
                     <debugTCK>false</debugTCK>
                     <cleanupaftertest>true</cleanupaftertest>
-                    <identitytypes>applicationidentity</identitytypes>
+                    <identitytypes>applicationidentity datastoreidentity</identitytypes>
                     <dbproperties>-Dderby.system.home=${basedir}/target/database/derby</dbproperties>
                     <signaturefile>${basedir}/src/conf/jdo-3_1-signatures.txt</signaturefile>
                     <cfgs>
@@ -107,7 +107,7 @@
                         -<cfg>inheritance2.conf</cfg>
                         <cfg>inheritance3.conf</cfg>
                         <cfg>inheritance4.conf</cfg>
-                       <cfg>instancecallbacks.conf</cfg>
+                        <cfg>instancecallbacks.conf</cfg>
                         <cfg>jdohelper.conf</cfg>
                         <cfg>jdoql.conf</cfg>
                         <cfg>lifecycle.conf</cfg>
@@ -123,7 +123,7 @@
                         <cfg>schemaAttributeOrm.conf</cfg>
                         <cfg>schemaAttributePackage.conf</cfg>
                         <cfg>security.conf</cfg>
-                        <cfg>transactions.conf</cfg><!-- -->
+                        <cfg>transactions.conf</cfg>
                     </cfgs>
                 </configuration>
             </plugin>
@@ -160,12 +160,12 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>2.2.0-m3</version>
+            <version>2.2.0-release</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>2.2.0-m3</version>
+            <version>2.2.0-release</version>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jpa</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>



Mime
View raw message