From jdo-hdean@example.net Thu Dec 10 11:53:28 2009
Return-Path: <jdo-hdean@example.net>
Delivered-To: hdean@example.net
Received: (qmail 24193 invoked from network); 10 Dec 2009 11:53:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 10 Dec 2009 11:53:28 -0000
Received: (qmail 286 invoked by uid 500); 10 Dec 2009 11:53:28 -0000
Mailing-List: contact hdean@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdean@example.net>
List-Unsubscribe: <mailto:hdean@example.net>
List-Post: <mailto:hdean@example.net>
List-Id: <jdo-commits.db.apache.org>
Reply-To: hdean@example.net
Delivered-To: mailing list hdean@example.net
Received: (qmail 277 invoked by uid 99); 10 Dec 2009 11:53:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 11:53:27 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=BAYES_00
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 11:53:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 236962388978; Thu, 10 Dec 2009 11:53:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r889214 - /db/jdo/trunk/tck2/project.xml
Date: Thu, 10 Dec 2009 11:53:02 -0000
To: hdean@example.net
From: hdean@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <hdean@example.net>

Author: andyj
Date: Thu Dec 10 11:52:57 2009
New Revision: 889214

URL: http://svn.apache.org/viewvc?rev=889214&view=rev
Log:
upgrade DN jar versions to latest

Modified:
    db/jdo/trunk/tck2/project.xml

Modified: db/jdo/trunk/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=889214&r1=889213&r2=889214&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.xml (original)
+++ db/jdo/trunk/tck2/project.xml Thu Dec 10 11:52:57 2009
@@ -59,25 +59,25 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>2.0.0-m4-SNAPSHOT</version>
+            <version>2.0.0-release-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>2.0.0-m4-SNAPSHOT</version>
+            <version>2.0.0-release-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-enhancer</artifactId>
-            <version>2.0.0-m4-SNAPSHOT</version>
+            <version>2.0.0-m4</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-jpa</artifactId>
-            <version>2.0.0-m4-SNAPSHOT</version>
+            <version>2.0.0-release-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-connectionpool</artifactId>
-            <version>2.0.0-m1</version>
+            <version>2.0.0-m2</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>



From jdo-hdean@example.net Fri Dec 11 10:13:27 2009
Return-Path: <jdo-hdean@example.net>
Delivered-To: hdean@example.net
Received: (qmail 79531 invoked from network); 11 Dec 2009 10:13:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 11 Dec 2009 10:13:27 -0000
Received: (qmail 93362 invoked by uid 500); 11 Dec 2009 10:13:26 -0000
Mailing-List: contact hdean@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdean@example.net>
List-Unsubscribe: <mailto:hdean@example.net>
List-Post: <mailto:hdean@example.net>
List-Id: <jdo-commits.db.apache.org>
Reply-To: hdean@example.net
Delivered-To: mailing list hdean@example.net
Received: (qmail 93353 invoked by uid 99); 11 Dec 2009 10:13:26 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 10:13:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2009 10:13:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id ADBFE23888E9; Fri, 11 Dec 2009 10:12:55 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r889552 - /db/jdo/trunk/tck2/project.xml
Date: Fri, 11 Dec 2009 10:12:55 -0000
To: hdean@example.net
From: hdean@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <hdean@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: andyj
Date: Fri Dec 11 10:12:55 2009
New Revision: 889552

URL: http://svn.apache.org/viewvc?rev=889552&view=rev
Log:
update enhancer version

Modified:
    db/jdo/trunk/tck2/project.xml

Modified: db/jdo/trunk/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=889552&r1=889551&r2=889552&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.xml (original)
+++ db/jdo/trunk/tck2/project.xml Fri Dec 11 10:12:55 2009
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-enhancer</artifactId>
-            <version>2.0.0-m4</version>
+            <version>2.0.0-release-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>



From jdo-hdean@example.net Fri Dec 18 17:04:15 2009
Return-Path: <jdo-hdean@example.net>
Delivered-To: hdean@example.net
Received: (qmail 95105 invoked from network); 18 Dec 2009 17:04:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 18 Dec 2009 17:04:15 -0000
Received: (qmail 98428 invoked by uid 500); 18 Dec 2009 17:04:15 -0000
Mailing-List: contact hdean@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdean@example.net>
List-Unsubscribe: <mailto:hdean@example.net>
List-Post: <mailto:hdean@example.net>
List-Id: <jdo-commits.db.apache.org>
Reply-To: hdean@example.net
Delivered-To: mailing list hdean@example.net
Received: (qmail 98419 invoked by uid 99); 18 Dec 2009 17:04:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 17:04:15 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=BAYES_00
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 17:04:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1DD1123889D2; Fri, 18 Dec 2009 17:03:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r892317 - in /db/jdo/trunk/api2/src/java/javax/jdo:
 Constants.java JDOQueryTimeoutException.java PersistenceManager.java
 PersistenceManagerFactory.java Query.java
Date: Fri, 18 Dec 2009 17:03:47 -0000
To: hdean@example.net
From: hdean@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <hdean@example.net>

Author: clr
Date: Fri Dec 18 17:03:47 2009
New Revision: 892317

URL: http://svn.apache.org/viewvc?rev=892317&view=rev
Log:
JDO-623 Change QueryTImeout to DatastoreTimeout

Removed:
    db/jdo/trunk/api2/src/java/javax/jdo/JDOQueryTimeoutException.java
Modified:
    db/jdo/trunk/api2/src/java/javax/jdo/Constants.java
    db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
    db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
    db/jdo/trunk/api2/src/java/javax/jdo/Query.java

Modified: db/jdo/trunk/api2/src/java/javax/jdo/Constants.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/Constants.java?rev=892317&r1=892316&r2=892317&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/Constants.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/Constants.java Fri Dec 18 17:03:47 2009
@@ -475,6 +475,14 @@
     static String OPTION_QUERY_SQL
         = "javax.jdo.query.SQL";
     /**
+     * "javax.jdo.option.DatastoreTimeout"
+     *
+     * @see PersistenceManagerFactory#supportedOptions()
+     * @since 2.3
+     */
+    static String OPTION_DATASTORE_TIMEOUT
+        = "javax.jdo.option.DatastoreTimeout";
+    /**
      * "javax.jdo.option.UnconstrainedQueryVariables"
      *
      * @see PersistenceManagerFactory#supportedOptions()

Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java?rev=892317&r1=892316&r2=892317&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java Fri Dec 18 17:03:47 2009
@@ -953,21 +953,74 @@
      */
    boolean getIgnoreCache();
    
-    /** Set the default query timeout setting for all <code>Query</code>
-     * instances obtained from this PersistenceManager.
-     *
-     * @param interval The default timeout setting (millisecs).
-     * @since 2.3
-     */
-    void setQueryTimeoutMillis(Integer interval);
-
-    /** Get the default query timeout setting for all 
-     * <code>Query</code> instances obtained from this PersistenceManager.
-     *
-     * @return the default query timeout setting.
-     * @since 2.3
-     */
-    Integer getQueryTimeoutMillis();
+   /**
+    * Specify a timeout interval (milliseconds) for any datastore read
+    * operations associated with this persistence manager. To unset
+    * the explicit timeout, specify null. For no timeout, specify 0.
+    * Read operations include, for example, those associated with query,
+    * getObjectById, refresh, retrieve, and extent iteration operations.
+    * If the datastore granularity is larger than milliseconds, the
+    * timeout value will be rounded up to the nearest supported datastore
+    * value.
+    * If a read operation hasn't completed within this interval, the operation
+    * will throw a JDODatastoreException. 
+    * If multiple datastore operations are required to complete the query,
+    * the timeout value applies to each of them individually.
+    * If the datastore and JDO implementation support timeouts, then
+    * javax.jdo.option.DatastoreTimeout is returned by
+    * PersistenceManagerFactory.supportedOptions().
+    * If timeouts are not supported,this method will throw
+    * JDOUnsupportedOptionException.
+    * @since 2.3
+    * @param interval the timeout interval (milliseconds)
+    */
+   void setDatastoreReadTimeoutMillis(Integer interval);
+
+   /** Get the effective timeout setting for datastore read operations
+    * associated with this persistence manager.
+    * If the timeout has not been set on this persistence manager explicitly,
+    * the default read timeout value from the persistence manager factory
+    * is returned.
+    * @see #setDatastoreReadTimeoutMillis(Integer)
+    * @see PersistenceManagerFactory#setDatastoreReadTimeoutMillis(Integer)
+    * @return the effective timeout setting (milliseconds).
+    * @since 2.3
+    */
+   Integer getDatastoreReadTimeoutMillis();
+
+   /**
+    * Specify a timeout interval (milliseconds) for any write operations
+    * associated with this persistence manager. To unset the explicit timeout,
+    * specify null. For no timeout, specify 0.
+    * Datastore write operations include, for example, operations associated
+    * with flush, commit, and delete by query.
+    * If the datastore granularity is larger than milliseconds, the
+    * timeout value will be rounded up to the nearest supported datastore
+    * value.
+    * If a write operation hasn't completed within this interval, methods
+    * will throw a JDODatastoreException. 
+    * If multiple datastore operations are required to complete the method,
+    * the timeout value applies to each of them individually.
+    * If the datastore and JDO implementation support timeouts, then
+    * javax.jdo.option.DatastoreTimeout is returned by
+    * PersistenceManagerFactory.supportedOptions().
+    * If timeouts are not supported,this method will throw
+    * JDOUnsupportedOptionException.
+    * @since 2.3
+    * @param interval the timeout interval (milliseconds)
+    */
+   void setDatastoreWriteTimeoutMillis(Integer interval);
+
+   /** Get the effective timeout setting for write operations. 
+    * If the timeout has not been set on this persistence manager explicitly,
+    * the default datastore write timeout value from the persistence manager
+    * factory is returned.
+    * @see #setDatastoreWriteTimeoutMillis(Integer)
+    * @see PersistenceManagerFactory#setDatastoreWriteTimeoutMillis(Integer)
+    * @return the effective timeout setting (milliseconds).
+    * @since 2.3
+    */
+   Integer getDatastoreWriteTimeoutMillis();
 
    /** Gets the detachAllOnCommit setting.
     * @see #setDetachAllOnCommit(boolean)

Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java?rev=892317&r1=892316&r2=892317&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Fri Dec 18 17:03:47 2009
@@ -520,21 +520,49 @@
      */
     void setTransactionIsolationLevel(String level);
 
-    /** Set the default query timeout setting for all <code>PersistenceManager</code>
-     * instances obtained from this factory.
-     *
-     * @param interval The default timeout setting (millisecs).
+    /**
+     * Specify a default timeout interval (milliseconds) for any read
+     * operations for persistence managers obtained from this persistence
+     * manager factory. To unset the explicit timeout, specify null.
+     * For no timeout, specify 0.
+     * If the datastore and JDO implementation support timeouts, then
+     * javax.jdo.option.DatastoreTimeout is returned by supportedOptions().
+     * If timeouts are not supported,this method will throw
+     * JDOUnsupportedOptionException.
      * @since 2.3
+     * @param interval the timeout interval (milliseconds)
      */
-    void setQueryTimeoutMillis(Integer interval);
+    void setDatastoreReadTimeoutMillis(Integer interval);
 
-    /** Get the default query timeout setting for all 
-     * <code>PersistenceManager</code> instances obtained from this factory.
-     *
-     * @return the default query timeout setting.
+    /** Get the default timeout setting for read operations.
+     * If timeouts are not supported,this method will return null.
+     * @see #setDatastoreReadTimeoutMillis(Integer)
+     * @return the default timeout setting (milliseconds).
+     * @since 2.3
+     */
+    Integer getDatastoreReadTimeoutMillis();
+
+    /**
+     * Specify a default timeout interval (milliseconds) for any write
+     * operations for persistence managers obtained from this persistence
+     * manager factory. To unset the explicit timeout, specify null.
+     * For no timeout, specify 0.
+     * If the datastore and JDO implementation support timeouts, then
+     * javax.jdo.option.DatastoreTimeout is returned by supportedOptions().
+     * If timeouts are not supported,this method will throw
+     * JDOUnsupportedOptionException.
+     * @since 2.3
+     * @param interval the timeout interval (milliseconds)
+     */
+    void setDatastoreWriteTimeoutMillis(Integer interval);
+
+    /** Get the default timeout setting for write operations.
+     * If timeouts are not supported,this method will return null.
+     * @see #setDatastoreWriteTimeoutMillis(Integer)
+     * @return the default timeout setting (milliseconds).
      * @since 2.3
      */
-    Integer getQueryTimeoutMillis();
+    Integer getDatastoreWriteTimeoutMillis();
 
     /** Return non-configurable properties of this 
      * <code>PersistenceManagerFactory</code>.
@@ -580,6 +608,7 @@
      * <BR>javax.jdo.option.TransactionIsolationLevel.snapshot
      * <BR>javax.jdo.option.TransactionIsolationLevel.serializable
      * <BR>javax.jdo.option.QueryCancel
+     * <BR>javax.jdo.option.DatastoreTimeout
      * <BR>javax.jdo.query.SQL
      * <BR>javax.jdo.query.JDOQL
      * </code>

Modified: db/jdo/trunk/api2/src/java/javax/jdo/Query.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/Query.java?rev=892317&r1=892316&r2=892317&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/Query.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/Query.java Fri Dec 18 17:03:47 2009
@@ -698,20 +698,66 @@
          String candidateCollectionExpression, Map parameters);
 
     /**
-     * Specify a timeout interval (milliseconds) for any query executions.
-     * If a query hasn't completed within this interval execute() will throw a
-     * JDOQueryTimeoutException.
+     * Specify a timeout interval (milliseconds) for any read operations
+     * associated with this query. To unset the explicit timeout for this
+     * query, specify null. For no timeout, specify 0.
+     * If the datastore granularity is larger than milliseconds, the
+     * timeout value will be rounded up to the nearest supported datastore
+     * value.
+     * If a read operation hasn't completed within this interval, executeXXX
+     * will throw a JDODatastoreException. 
+     * If multiple datastore operations are required to complete the query,
+     * the timeout value applies to each of them individually.
+     * If the datastore and JDO implementation support timeouts, then
+     * javax.jdo.option.DatastoreTimeout is returned by
+     * PersistenceManagerFactory.supportedOptions().
+     * If timeouts are not supported,this method will throw
+     * JDOUnsupportedOptionException.
+     * @since 2.3
+     * @param interval the timeout interval (milliseconds)
+     */
+    void setDatastoreReadTimeoutMillis(Integer interval);
+
+    /** Get the effective timeout setting for read operations.
+     * If the timeout has not been set on this query explicitly, the effective
+     * datastore read timeout value from the persistence manager is returned.
+     * @see #setDatastoreReadTimeoutMillis(Integer)
+     * @see PersistenceManager#setDatastoreReadTimeoutMillis(Integer)
+     * @return the effective timeout setting (milliseconds).
      * @since 2.3
-     * @param interval The timeout interval (millisecs)
      */
-    void setTimeoutMillis(Integer interval);
+    Integer getDatastoreReadTimeoutMillis();
 
-    /** Get the timeout setting for query executions. 
-     *
-     * @return the query timeout setting.
+    /**
+     * Specify a timeout interval (milliseconds) for any write operations
+     * associated with this query. To unset the explicit timeout for this
+     * query, specify null. For no timeout, specify 0.
+     * If the datastore granularity is larger than milliseconds, the
+     * timeout value will be rounded up to the nearest supported datastore
+     * value.
+     * If a write operation hasn't completed within this interval, deleteXXX
+     * will throw a JDODatastoreException. 
+     * If multiple datastore operations are required to complete the query,
+     * the timeout value applies to each of them individually.
+     * If the datastore and JDO implementation support timeouts, then
+     * javax.jdo.option.DatastoreTimeout is returned by
+     * PersistenceManagerFactory.supportedOptions().
+     * If timeouts are not supported,this method will throw
+     * JDOUnsupportedOptionException.
+     * @since 2.3
+     * @param interval the timeout interval (milliseconds)
+     */
+    void setDatastoreWriteTimeoutMillis(Integer interval);
+
+    /** Get the effective timeout setting for write operations. 
+     * If the timeout has not been set on this query explicitly, the effective
+     * datastore write timeout value from the persistence manager is returned.
+     * @see #setDatastoreWriteTimeoutMillis(Integer)
+     * @see PersistenceManager#setDatastoreWriteTimeoutMillis(Integer)
+     * @return the effective timeout setting (milliseconds).
      * @since 2.3
      */
-    Integer getTimeoutMillis();
+    Integer getDatastoreWriteTimeoutMillis();
 
     /**
      * Method to cancel any executing queries.



From jdo-hdean@example.net Sun Dec 27 09:27:16 2009
Return-Path: <jdo-hdean@example.net>
Delivered-To: hdean@example.net
Received: (qmail 80397 invoked from network); 27 Dec 2009 09:27:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 27 Dec 2009 09:27:16 -0000
Received: (qmail 50158 invoked by uid 500); 27 Dec 2009 09:27:15 -0000
Mailing-List: contact hdean@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdean@example.net>
List-Unsubscribe: <mailto:hdean@example.net>
List-Post: <mailto:hdean@example.net>
List-Id: <jdo-commits.db.apache.org>
Reply-To: hdean@example.net
Delivered-To: mailing list hdean@example.net
Received: (qmail 50149 invoked by uid 99); 27 Dec 2009 09:27:14 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Dec 2009 09:27:14 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Dec 2009 09:27:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E658F2388996; Sun, 27 Dec 2009 09:26:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r894049 -
 /db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java
Date: Sun, 27 Dec 2009 09:26:47 -0000
To: hdean@example.net
From: hdean@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <hdean@example.net>

Author: andyj
Date: Sun Dec 27 09:26:46 2009
New Revision: 894049

URL: http://svn.apache.org/viewvc?rev=894049&view=rev
Log:
fix compile against current api2 for timeout changes

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java?rev=894049&r1=894048&r2=894049&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/query/api/QueryTimeout.java Sun Dec 27 09:26:46 2009
@@ -17,10 +17,10 @@
 
 package org.apache.jdo.tck.query.api;
 
-import javax.jdo.JDOQueryTimeoutException;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
+import javax.jdo.JDODataStoreException;
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.mylib.PCPoint;
@@ -78,14 +78,14 @@
         try {
             tx.begin();
             Query query = pm.newQuery(SSJDOQL);
-            query.setTimeoutMillis(TIMEOUT_MILLIS);
+            query.setDatastoreReadTimeoutMillis(TIMEOUT_MILLIS);
             Object result = query.execute();
             tx.commit();
             tx = null;
             fail(ASSERTION_FAILED,
                  "Query.execute should result in a JDOQueryTimeoutException.");
         }
-        catch (JDOQueryTimeoutException ex) {
+        catch (JDODataStoreException ex) {
             // expected exception
             if (debug) {
                 logger.debug("caught expected exception " + ex);
@@ -105,12 +105,12 @@
         try {
             tx.begin();
             Query query = pm.newQuery(SSJDOQL);
-            query.setTimeoutMillis(0);
+            query.setDatastoreReadTimeoutMillis(0);
             Object result = query.execute();
             tx.commit();
             tx = null;
         }
-        catch (JDOQueryTimeoutException ex) {
+        catch (JDODataStoreException ex) {
             // setting the timeout to 0 should not result in an exception
             fail(ASSERTION_FAILED,
                  "Query.execute should not result in a JDOQueryTimeoutException.");




{'source': 'Apache Software Foundation Public Mail Archives'}