svn commit: r290687 [2/2] - in /incubator/jdo/trunk/tck20: assertions/ test/conf/ test/java/org/apache/jdo/tck/query/ test/java/org/apache/jdo/tck/query/api/ test/java/org/apache/jdo/tck/query/jdoql/ test/java/org/apache/jdo/tck/query/jdoql/keywords/ t...

[mb...@apache.org]

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/AssignmentPrePostIncrementDecrementNotSupported.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/AssignmentPrePostIncrementDecrementNotSupported.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/AssignmentPrePostIncrementDecrementNotSupported.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import javax.jdo.JDOUserException;
@@ -23,6 +23,7 @@
 import javax.jdo.Query;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/Cast.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecuteQueryWhenPersistenceManagerIsClosed.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecuteQueryWhenPersistenceManagerIsClosed.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecuteQueryWhenPersistenceManagerIsClosed.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import javax.jdo.JDOFatalUserException;
@@ -23,6 +23,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.Iterator;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java Wed Sep 21 05:38:24 2005
@@ -15,11 +15,12 @@
  */
 
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import javax.jdo.*;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleActiveQueryInstanceInSamePersistenceManager.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleActiveQueryInstanceInSamePersistenceManager.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleActiveQueryInstanceInSamePersistenceManager.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NamespaceOfIdentifiers.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NamespaceOfIdentifiers.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NamespaceOfIdentifiers.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,6 +23,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.pc.company.MedicalInsurance;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.pc.company.Project;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/OrderingSpecification.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/OrderingSpecification.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/OrderingSpecification.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.util.ArrayList;
@@ -27,6 +27,7 @@
 
 import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParenthesesMarkOperatorPrecedence.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParenthesesMarkOperatorPrecedence.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParenthesesMarkOperatorPrecedence.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryIsSerializable.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryIsSerializable.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryIsSerializable.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.io.FileInputStream;
@@ -30,6 +30,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryResultPassedToAnotherQuery.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryResultPassedToAnotherQuery.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryResultPassedToAnotherQuery.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.util.ArrayList;
@@ -26,6 +26,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryWithNoFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/RestoredSerializedQueryInstanceLosesAssociationWithPM.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,6 +26,7 @@
 import javax.jdo.Query;
 import javax.jdo.Transaction;
 
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,6 +27,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/WhiteSpaceIsACharacterAndIgnored.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/WhiteSpaceIsACharacterAndIgnored.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/WhiteSpaceIsACharacterAndIgnored.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql;
 
 import java.util.Collection;
 
@@ -23,6 +23,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ThisIsReservedWordForElementOfCollection.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ThisIsReservedWordForElementOfCollection.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ThisIsReservedWordForElementOfCollection.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java Wed Sep 21 05:38:24 2005
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.keywords;
 
 import java.util.Collection;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/UseOfThisToAcessHiddenField.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/UseOfThisToAcessHiddenField.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/UseOfThisToAcessHiddenField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.keywords;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +24,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MethodsAndObjectConstructionNotSupported.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MethodsAndObjectConstructionNotSupported.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MethodsAndObjectConstructionNotSupported.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.methods;
 
 
 import javax.jdo.JDOUserException;
@@ -22,6 +22,7 @@
 import javax.jdo.Query;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.methods;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.methods;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinaryAddition.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinaryAddition.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinaryAddition.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinarySubtraction.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinarySubtraction.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BinarySubtraction.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BitwiseComplement.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BitwiseComplement.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BitwiseComplement.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalAND.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalAND.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalAND.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalOR.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalOR.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/BooleanLogicalOR.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ComparisonTests.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ComparisonTests.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ComparisonTests.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.Iterator;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalAND.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalAND.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalAND.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalOR.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalOR.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/ConditionalOR.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Division.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Division.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Division.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Division.java Wed Sep 21 05:38:24 2005
@@ -15,7 +15,7 @@
  */
 
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Equality.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Equality.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Equality.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Calendar;
 import java.util.Collection;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThan.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/GreaterThanOrEqual.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThan.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThan.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThan.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThanOrEqual.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThanOrEqual.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LessThanOrEqual.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LogicalComplement.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LogicalComplement.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/LogicalComplement.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Multiplication.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Multiplication.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/Multiplication.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/NotEquals.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/NotEquals.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/NotEquals.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/PromotionOfNumericOperands.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/PromotionOfNumericOperands.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/PromotionOfNumericOperands.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/SignInversion.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/SignInversion.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/SignInversion.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 import java.util.HashSet;

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/UnaryPlus.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/UnaryPlus.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/UnaryPlus.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query.operators;
+package org.apache.jdo.tck.query.jdoql.operators;
 
 import java.util.Collection;
 

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/BoundParameterCheck.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/BoundParameterCheck.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/BoundParameterCheck.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.parameters;
 
 
 import javax.jdo.JDOUserException;
@@ -23,6 +23,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.parameters;
 
 import java.util.Collection;
 import javax.jdo.JDOUserException;
@@ -26,6 +26,7 @@
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Department;
 import org.apache.jdo.tck.pc.company.Employee;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.parameters;
 
 
 import java.util.ArrayList;
@@ -25,6 +25,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PCPoint;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/PrimitiveParameterPassedAsNull.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/PrimitiveParameterPassedAsNull.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/PrimitiveParameterPassedAsNull.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.parameters;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -25,6 +25,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java Wed Sep 21 05:38:24 2005
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.jdoql.variables;
 
 import javax.jdo.JDOUserException;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 import javax.jdo.Transaction;
 
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**

Copied: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java (from r290406, incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ImmutableQueryResult.java)
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java?p2=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java&p1=incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ImmutableQueryResult.java&r1=290406&r2=290687&rev=290687&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ImmutableQueryResult.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java Wed Sep 21 05:38:24 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jdo.tck.query;
+package org.apache.jdo.tck.query.result;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,6 +23,7 @@
 import javax.jdo.Transaction;
 
 import org.apache.jdo.tck.pc.mylib.PrimitiveTypes;
+import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**