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 br...@apache.org on 2005/10/28 16:04:16 UTC

svn commit: r329205 - in /incubator/jdo/trunk/tck20/test: conf/log4j.properties conf/logging.properties conf/simplelog.properties java/org/apache/jdo/tck/query/QueryElementHolder.java

Author: brazil
Date: Fri Oct 28 07:04:10 2005
New Revision: 329205

URL: http://svn.apache.org/viewcvs?rev=329205&view=rev
Log:
Two bug fixes concerning JDO-162: 1) method call Query.setString(String) incorporated, 2) logger for class MyLibReader added in all logging properties files.

Modified:
    incubator/jdo/trunk/tck20/test/conf/log4j.properties
    incubator/jdo/trunk/tck20/test/conf/logging.properties
    incubator/jdo/trunk/tck20/test/conf/simplelog.properties
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryElementHolder.java

Modified: incubator/jdo/trunk/tck20/test/conf/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/log4j.properties?rev=329205&r1=329204&r2=329205&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/log4j.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/log4j.properties Fri Oct 28 07:04:10 2005
@@ -28,6 +28,7 @@
 log4j.logger.org.springframework = ERROR, TCK
 log4j.additivity.org.springframework = false 
 log4j.logger.org.apache.jdo.tck.pc.company.CompanyModelReader = ERROR, TCK
+log4j.logger.org.apache.jdo.tck.pc.mylib.MylibReader = ERROR, TCK
 
 # TCK appenders
 log4j.appender.TCK = org.apache.jdo.tck.util.TCKFileAppender

Modified: incubator/jdo/trunk/tck20/test/conf/logging.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/logging.properties?rev=329205&r1=329204&r2=329205&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/logging.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/logging.properties Fri Oct 28 07:04:10 2005
@@ -42,6 +42,7 @@
 # SpringFramework loggers 
 org.springframework.level = SEVERE
 org.apache.jdo.tck.pc.company.CompanyModelReader.level = SEVERE
+org.apache.jdo.tck.pc.mylib.MylibReader = SEVERE
 
 org.apache.jdo.tck.util.TCKFileHandler.fileName = tck.txt
 org.apache.jdo.tck.util.TCKFileHandler.level = FINEST

Modified: incubator/jdo/trunk/tck20/test/conf/simplelog.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/simplelog.properties?rev=329205&r1=329204&r2=329205&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/simplelog.properties (original)
+++ incubator/jdo/trunk/tck20/test/conf/simplelog.properties Fri Oct 28 07:04:10 2005
@@ -33,6 +33,7 @@
 # SpringFramework loggers 
 org.apache.commons.logging.simplelog.log.org.springframework = error
 org.apache.commons.logging.simplelog.log.org.apache.jdo.tck.pc.company.CompanyModelReader = error
+org.apache.commons.logging.simplelog.log.org.apache.jdo.tck.pc.mylib.MylibReader = error
 
 # JDO vendor specific loggers 
 #org.apache.commons.logging.simplelog.log.<vendor> = info

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryElementHolder.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryElementHolder.java?rev=329205&r1=329204&r2=329205&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryElementHolder.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryElementHolder.java Fri Oct 28 07:04:10 2005
@@ -318,10 +318,10 @@
      * @param query the query instance
      */
     private void rangeToAPI(Query query) {
-        /*TODO if (this.fromString != null && this.toString != null) {
+        if (this.fromString != null && this.toString != null) {
             query.setRange(this.fromString + ',' + this.toString);
         } 
-        else*/ if (this.fromLong != null && this.toLong != null) {
+        else if (this.fromLong != null && this.toLong != null) {
             query.setRange(this.fromLong.longValue(), this.toLong.longValue());
         }
     }