db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r171353 [1/13] - in /incubator/jdo/trunk/query20: ./ src/ src/conf/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/jdo/ src/java/org/apache/jdo/impl/ src/java/org/apache/jdo/impl/jdoql/ src/java/org/apache/jdo/impl/jdoql/jdoqlc/ src/java/org/apache/jdo/impl/jdoql/scope/ src/java/org/apache/jdo/impl/jdoql/tree/ src/java/org/apache/jdo/jdoql/ src/java/org/apache/jdo/jdoql/tree/
Date Sun, 22 May 2005 18:09:00 GMT
Author: mbo
Date: Sun May 22 11:08:57 2005
New Revision: 171353

URL: http://svn.apache.org/viewcvs?rev=171353&view=rev
Log:
First version of JDO2 implementation (Query). It includes the implementation of the JDOQL
query compiler and the JDOQL tree nodes.

Added:
    incubator/jdo/trunk/query20/
    incubator/jdo/trunk/query20/maven.xml
    incubator/jdo/trunk/query20/project.properties
    incubator/jdo/trunk/query20/project.xml
    incubator/jdo/trunk/query20/src/
    incubator/jdo/trunk/query20/src/conf/
    incubator/jdo/trunk/query20/src/conf/commons-logging.properties
    incubator/jdo/trunk/query20/src/conf/logging.properties
    incubator/jdo/trunk/query20/src/conf/simplelog.properties
    incubator/jdo/trunk/query20/src/java/
    incubator/jdo/trunk/query20/src/java/org/
    incubator/jdo/trunk/query20/src/java/org/apache/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/MemoryQuery.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/OrderingComparator.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/QueryImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/QueryResultHelperImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/ErrorMsg.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/JDOQL.g
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/JDOQLAST.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/JDOQLASTFactory.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/JDOQLC.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.g
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/Semantic.g
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/SimpleFieldManager.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/TypeSupport.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/jdoqlc/VariableChecker.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/AbstractValueTable.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/ParameterTable.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/SymbolTable.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/TypeNames.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/UNDEFINED.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/scope/VariableTable.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/AndExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/AscendingOrderingExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/BinaryExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/BooleanLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ByteLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/CandidateClassImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/CastExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/CharLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ComplementExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ConditionalAndExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ConditionalOrExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ConstantExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ContainsCallExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/Decl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/DescendingOrderingExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/DivideExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/DoubleLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/EndsWithCallExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/EqualsExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/Expr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/FieldAccessExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/FilterExpressionDumper.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/FloatLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/GreaterThanEqualsExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/GreaterThanExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/IdentifierExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/IntLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/IsEmptyCallExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/LessThanEqualsExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/LessThanExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/LongLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/MethodCallExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/MinusExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/NodeImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/NotEqualsExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/NotExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/OrExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/OrderingExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ParameterAccessExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ParameterDecl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/PlusExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ShortLiteralExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/StartsWithCallExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/StaticFieldAccessExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/ThisExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/TimesExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/Tree.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/TypeImpl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/UnaryExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/UnaryMinusExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/UnaryPlusExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/VariableAccessExpr.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/tree/VariableDecl.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/JDOQLQueryFactory.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/JDOQueryException.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/package.html
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/AbstractNodeVisitor.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/AndExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/AscendingOrderingExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/BinaryExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/BooleanLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ByteLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/CandidateClass.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/CastExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/CharLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ComplementExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ConditionalAndExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ConditionalOrExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ConstantExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ContainsCallExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/Declaration.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/DescendingOrderingExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/DivideExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/DoubleLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/EndsWithCallExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/EqualsExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/Expression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ExpressionFactory.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/FieldAccessExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/FloatLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/GreaterThanEqualsExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/GreaterThanExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/IdentifierExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/IntLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/IsEmptyCallExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/LessThanEqualsExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/LessThanExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/LongLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/MethodCallExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/MinusExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/Node.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/NodeVisitor.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/NotEqualsExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/NotExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/OrExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/OrderingExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ParameterAccessExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ParameterDeclaration.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/PlusExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/QueryTree.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ShortLiteralExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/StartsWithCallExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/StaticFieldAccessExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ThisExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/TimesExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/TreeWalker.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/Type.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/UnaryExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/UnaryMinusExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/UnaryPlusExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/ValueTable.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/VariableAccessExpression.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/VariableDeclaration.java
    incubator/jdo/trunk/query20/src/java/org/apache/jdo/jdoql/tree/package.html

Added: incubator/jdo/trunk/query20/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/maven.xml?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/maven.xml (added)
+++ incubator/jdo/trunk/query20/maven.xml Sun May 22 11:08:57 2005
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project default="default"
+    xmlns:j="jelly:core"
+    xmlns:ant="jelly:ant"
+    xmlns:maven="jelly:maven"
+    >
+
+    <!-- ==================== -->
+    <!-- Default Global Goals -->
+    <!-- ==================== -->
+
+    <goal name="default">
+        <attainGoal name="jar:install-snapshot"/>
+    </goal>
+
+    <goal name="build">
+        <attainGoal name="default"/>
+    </goal>
+
+    <goal name="rebuild">
+        <attainGoal name="clean"/>
+        <attainGoal name="build"/>
+    </goal>
+
+    <preGoal name="java:compile">
+        <attainGoal name="antlr.compile"/>
+    </preGoal>
+
+    <postGoal name="clean:clean">
+        <attainGoal name="antlr.clean"/>
+    </postGoal>
+
+    <goal name="clobber" prereqs="clean">
+        <delete>
+            <fileset dir="." defaultexcludes="no" includes="**/*~"/>
+        </delete>
+    </goal>
+
+    <!-- ============= -->
+    <!-- ANTLR support -->
+    <!-- ============= -->
+
+    <preGoal name="antlr.compile">
+        <condition property="antlr.required">
+            <not>
+                <and>
+                    <uptodate targetfile="${jdo.antlr.src.dir}/JDOQLParser.java"
+                              srcfile="${jdo.antlr.src.dir}/JDOQL.g" />
+                    <uptodate targetfile="${jdo.antlr.src.dir}/Semantic.java"
+                              srcfile="${jdo.antlr.src.dir}/Semantic.g" />
+                    <uptodate targetfile="${jdo.antlr.src.dir}/Optimizer.java"
+                              srcfile="${jdo.antlr.src.dir}/Optimizer.g" />
+                </and>
+            </not>
+        </condition>
+    </preGoal>
+
+    <goal name="antlr.compile">
+        <j:if test="${antlr.required}">
+	    <java dir="${jdo.antlr.src.dir}" classname="antlr.Tool" fork="yes">
+                <arg value="JDOQL.g"/> 
+                <classpath refid="maven.dependency.classpath"/>
+            </java>
+	    <java dir="${jdo.antlr.src.dir}" classname="antlr.Tool" fork="yes">
+                <arg value="Semantic.g"/> 
+                <classpath refid="maven.dependency.classpath"/>
+            </java>
+	    <java dir="${jdo.antlr.src.dir}" classname="antlr.Tool" fork="yes">
+                <arg value="Optimizer.g"/> 
+                <classpath refid="maven.dependency.classpath"/>
+            </java>
+        </j:if>
+    </goal>
+
+    <goal name="antlr.clean">
+        <delete>
+            <fileset dir="${jdo.antlr.src.dir}" 
+                     includes="JDOQLLexer.java, JDOQLParser.java, Semantic*.java, 
+                               Optimizer*.java, *TokenTypes.*"/>
+        </delete>
+    </goal>
+
+</project>

Added: incubator/jdo/trunk/query20/project.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/project.properties?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/project.properties (added)
+++ incubator/jdo/trunk/query20/project.properties Sun May 22 11:08:57 2005
@@ -0,0 +1,25 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+
+# checkstyle settings
+maven.checkstyle.properties = ${basedir}/../jdo_checks.xml
+maven.checkstyle.excludes = \
+org/apache/jdo/impl/jdoql/jdoqlc/*TokenTypes.java,\
+org/apache/jdo/impl/jdoql/jdoqlc/JDOQLParser.java, \
+org/apache/jdo/impl/jdoql/jdoqlc/JDOQLLexer.java, \
+org/apache/jdo/impl/jdoql/jdoqlc/Semantic.java, \
+org/apache/jdo/impl/jdoql/jdoqlc/Optimizer.java
+
+jdo.antlr.src.dir = ${basedir}/src/java/org/apache/jdo/impl/jdoql/jdoqlc

Added: incubator/jdo/trunk/query20/project.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/project.xml?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/project.xml (added)
+++ incubator/jdo/trunk/query20/project.xml Sun May 22 11:08:57 2005
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../project.xml</extend>
+    <!-- ============== -->
+    <!-- Identification -->
+    <!-- ============== -->
+    <name>JDO2 Implementation (Query)</name>
+    <artifactId>jdo2-query</artifactId>
+    <currentVersion>2.0</currentVersion>
+    <package>org.apache.jdo</package>
+    <shortDescription>Java Data Object 2.0 (JDO) Core</shortDescription>
+    <description>The Java Data Objects 2.0 (JDO) API is a standard interface-based

+Java model abstraction of persistence, developed as Java Specification 
+Request JSR 243 under the auspices of the Java Community Process.</description>
+    <repository />
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+        <dependency>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo1-api</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo2-core</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>apache-jdo</groupId>
+            <artifactId>jdo2-runtime</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <id>commons-logging</id>
+            <version>1.0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.3</version>
+            <url>http://www.antlr.org/download.html</url>
+        </dependency>
+    </dependencies>
+    <!-- =================== -->
+    <!-- Build Specification -->
+    <!-- =================== -->
+    <build>
+        <sourceDirectory>src/java</sourceDirectory>
+        <!-- J A R  R E S O U R C E S -->
+        <!-- Resources that are packaged up inside the JAR file -->
+        <resources>
+            <resource>
+                <directory>${basedir}/src/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+</project>
+

Added: incubator/jdo/trunk/query20/src/conf/commons-logging.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/src/conf/commons-logging.properties?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/src/conf/commons-logging.properties (added)
+++ incubator/jdo/trunk/query20/src/conf/commons-logging.properties Sun May 22 11:08:57 2005
@@ -0,0 +1,44 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+
+#
+# This is a sample apache commons logging configuration file defining logging
+# properties for the JDO2 Implementation (Query) sources. It defines what
+# logging implementation the apache commons logging API should use by specifying
+# the property org.apache.commons.logging.Log (see below). Please note, that
+# there are separate property files for each logging implementation to set the
+# log level of the loggers:
+# - SimpleLog:      simplelog.properties 
+# - JDK1.4 logging: logging.properties
+#
+# The JDO2 Implementation (Query) sources use the following logger instances:
+# org.apache.jdo.impl.jdoql           JDOQL query runtime
+# org.apache.jdo.impl.jdoql.jdoqlc    JDOQL query compiler
+# Dependent projects:
+# org.apache.jdo.util                 Utility classes
+# org.apache.jdo.impl.model.jdo       JDOModel implementation
+# org.apache.jdo.impl.model.jdo.xml   XML parser for JDO metadata files
+# org.apache.jdo.impl.pm              PM and PMF implementation
+# org.apache.jdo.impl.sco             SCO implementation
+# org.apache.jdo.impl.state           StateManager implementation
+# org.apache.jdo.store                Generic StoreManager implementation
+#
+
+# Uncomment the next line if you want to use the apache simple logger
+#org.apache.commons.logging.Log = org.apache.commons.logging.impl.SimpleLog
+
+# Uncomment the next two lines if you want to use JDK 1.4 logging
+#org.apache.commons.logging.Log = org.apache.jdo.util.JDOJdk14Logger
+

Added: incubator/jdo/trunk/query20/src/conf/logging.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/src/conf/logging.properties?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/src/conf/logging.properties (added)
+++ incubator/jdo/trunk/query20/src/conf/logging.properties Sun May 22 11:08:57 2005
@@ -0,0 +1,66 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+
+#
+# This is a sample properties file to configure standard JDK 1.4 logging for 
+# the JDO2 Implementation (Query) sources. 
+# Below you find an entry for each of the source logger instances. 
+# Please uncomment the line and adapt the log level to your needs, 
+# in case to want to enable a particular logger.
+#
+# The following describes the mapping between the log level of JDK 1.4 logging
+# and apache commns logging:
+#   JDK 1.4        Apache 
+#   FINEST         trace 
+#   FINE, FINER    debug 
+#   INFO, CONFIG   info
+#   WARNING        warn
+#   SEVERE         error, fatal
+#
+
+######################
+# Query source logger
+######################
+
+# JDOQL query logger
+#org.apache.jdo.impl.jdoql.level = FINE
+# JDOQL query compiler logger
+#org.apache.jdo.impl.jdoql.jdoqlc.level = FINE
+
+######################
+# Dependent projects
+######################
+
+# Utility class logger
+#org.apache.jdo.util.level = FINE
+# JDOModel logger
+#org.apache.jdo.impl.model.jdo.level = FINE
+# XML parser logger
+#org.apache.jdo.impl.model.jdo.xml.level = FINE
+# PM and PMF logger
+#org.apache.jdo.impl.pm.level = FINE
+# SCO logger
+#org.apache.jdo.impl.sco.level = FINE
+# StateManager logger
+#org.apache.jdo.impl.state.level = FINE
+# Generic StoreManager logger
+#org.apache.jdo.store.level = FINE
+
+######################
+# JDK 1.4 logging properties
+######################
+
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = FINEST

Added: incubator/jdo/trunk/query20/src/conf/simplelog.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/src/conf/simplelog.properties?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/src/conf/simplelog.properties (added)
+++ incubator/jdo/trunk/query20/src/conf/simplelog.properties Sun May 22 11:08:57 2005
@@ -0,0 +1,56 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+
+#
+# This is a sample properties file to configure apache commons logging SimpleLog
+# implementation for the JDO2 Implementation (Query) sources. 
+# Below you find an entry for each of the source logger instances. 
+# Please uncomment the line and adapt the log level to your needs, 
+# in case to want to enable a particular logger.
+#
+
+######################
+# Query source logger
+######################
+
+# JDOQL query logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.jdoql = debug
+# JDOQL query compiler logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.jdoql.jdoqlc = debug
+
+######################
+# Dependent projects
+######################
+
+# Utility class logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.util = debug
+# JDOModel logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.model.jdo = debug
+# XML parser logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.model.jdo.xml = debug
+# PM and PMF logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.pm = debug
+# SCO logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.sco = debug
+# StateManager logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.impl.state = debug
+# Generic StoreManager logger
+#org.apache.commons.logging.simplelog.log.org.apache.jdo.store = debug
+
+######################
+# Default logging level
+######################
+
+org.apache.commons.logging.simplelog.defaultlog = error

Added: incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties (added)
+++ incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/Bundle.properties Sun May
22 11:08:57 2005
@@ -0,0 +1,225 @@
+#
+# Copyright 2005 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at 
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+
+# This file should conform to netbeans standards
+# (http://www.netbeans.org/i18n)
+
+# resource bundle for the messages
+# key consists of: <PREFIX_><description>
+# <PREFIX_> - any valid prefix like MSG_, EXC_, etc.
+# <description> - short description started with the upper case letter and used
+# upper case to represent each next word.
+
+#
+# resource bundle for query messages
+#
+
+#
+# generic
+#
+EXC_MissingCandidateClass=Missing candidate class specification.
+
+#
+# QueryImpl
+#
+EXC_NullQueryInstance=Specified query is null.
+EXC_InvalidCompiledQuery=Invalid compiled query of type ''{0}''.
+EXC_UnboundQuery=Query is not bound to a PersistenceManager.
+EXC_UnknownCandidateClass=Unknown candidate class ''{0}''
+EXC_NoTransaction=No transaction and NontransactionalRead is false.
+
+#
+# main jdoqlc compiler class
+#
+#NOI18N
+ERR_UnexpectedExceptionSemantic=JDOQLC.semanticCheck unexpected exception
+#NOI18N
+ERR_UnexpectedExceptionOptimizer=JDOQLC.optimize unexpected exception
+
+#
+# jdoqlc error message helper class
+#
+EXC_PositionInfoMsg={0}: {1}
+EXC_PositionInfoMsgColumn={0} column({1}): {2}
+EXC_PositionInfoMsgLineColumn={0} line({1}) column({2}): {3}
+
+#
+# jdoqlc syntax error messages
+#
+EXC_SyntaxError=Syntax error.
+EXC_SyntaxErrorAt=Syntax error at ''{0}''.
+EXC_UnexpectedToken=Syntax error unexpected token ''{0}''.
+EXC_UnexpectedChar=Syntax error unexpected char ''{0}''.
+EXC_ExpectedCharFound=Syntax error expected char ''{0}'', found ''{1}''.
+EXC_UnexpectedEOF=Unexpected end of text.
+#NOI18N
+ERR_UnexpectedExceptionUnicode=JDOQLLexer.UNICODE_STR unexpected exception
+
+#
+# jdoqlc semantic error messages (unsupported operations)
+#
+
+#
+# jdoqlc semantic error messages (user errors)
+#
+EXC_CollectionElementTypeMismatch=Collection element type ''{0}'' and argument type ''{1}''
not compatible.
+EXC_ClassTypeExpressionExpected=Expression of class type expected.
+EXC_InvalidStaticReference=Cannot make a static reference to non-static variable ''{0}''
of class ''{1}''.
+EXC_NotSortableType=Operand type ''{0}'' of {1} is not sortable.
+EXC_UndefinedExpression=Undefined expression ''{0}''.
+EXC_BooleanFilterExpected=Boolean expression expected, filter expression has type ''{0}''.
+EXC_CollectionTypeExpected=Collection expression expected, expression has type ''{0}''.
+EXC_StringTypeExpected=String expression expected, expression has type ''{0}''.
+EXC_MultipleDeclaration=Multiple declaration of ''{0}''.
+EXC_MultipleImport=Multiple import of ''{0}''.
+EXC_WrongNumberOfArgs=Wrong number of arguments.
+EXC_ArgumentTypeMismatch=Incompatible type of argument. Cannot convert ''{0}'' to ''{1}''.
+EXC_InvalidArguments=Invalid argument(s) for ''{0}''.
+EXC_InvalidMethodCall=Invalid method call.
+EXC_UnknownField=Field ''{0}'' not defined for class ''{1}''.
+EXC_UnknownType=Unknown type ''{0}''.
+EXC_UndefinedIdentifier=Undefined identifier ''{0}''.
+EXC_InvalidCast=Cannot cast expression of type ''{0}'' to type ''{1}''.
+EXC_NotSortableInOrdering=Type ''{0}'' of ordering expression is not sortable.
+EXC_InvalidParameterAccess=Identifier ''{0}'' used in parameter access node is not declared
as parameter
+EXC_InvalidVariableAccess=Identifier ''{0}'' used in variable access node is not declared
as variable
+#NOI18N
+ERR_SemanticError=Semantic error:
+#NOI18N
+ERR_MissingChildren=Ivalid node (missing children): ''{0}''
+
+#
+# jdoqlc variable checker
+#
+EXC_UnsupportedMultipleConstraints=Multiple constraints for variable ''{0}''.
+EXC_UnconstraintVariable=Variable ''{0}'' is not constrained by contains call - unconstrained
variables not supported.
+EXC_UnusedVariable=Variable ''{0}'' defined but not used.
+EXC_UnsupportedCyclicConstaint=Unsupported cyclic constraint definition for variable ''{0}''.
+EXC_DifferentConstraints=Different constraints for the same variable ''{0}''.
+#NOI18N
+ERR_VariableCheckerUndefinedVariable=VariableChecker.{0}: undefined variable ''{1}''
+#NOI18N
+ERR_VariableCheckerMultipleDependencies=VariableChecker.markUsed: multiple dependencies for
variable ''{0}'' old ''{1}'' new ''{2}''
+
+#
+# jdoqlc optimizer messages
+#
+EXC_InvalidLiteral=Invalid {0} literal ''{1}''.
+#NOI18N
+ERR_OptimizerError=Optimizer error:
+#NOI18N
+ERR_OptmizerInvalidType=Optimizer.{0}: invalid type ''{1}''
+#NOI18N
+ERR_OptmizerNumberExpected=Optimizer.{0}: expected number value ''{1}''
+#NOI18N
+ERR_OptmizerCollectionExpected=Optimizer.{0}: expected collection ''{1}''
+
+#
+# jdoqlc JDOQLASTFactory
+#
+#NOI18N
+ERR_UnexpectedExceptionClone=Unexpected exception during clone
+
+#
+# scope.AbstractValueTable
+#
+#NOI18N
+ERR_InvalidTableForExecution=Invalid table ''{0}'' for query execution, value map not initialized.
+#NOI18N
+ERR_UnexpectedCloneProblems=Unexpected problems during clone
+
+#
+# scope.ParameterTable
+#
+EXC_UnboundQueryParameter=Unbound query parameter ''{0}''.
+EXC_UndefinedQueryParameter=Undefined query parameter ''{0}''.
+EXC_WrongNumberOfQueryParameters=Wrong number of query parameter values.
+EXC_IncompatibleTypeOfQueryParameter=Incompatible type of actual query parameter. Cannot
convert ''{0}'' to ''{1}''.
+
+#
+# scope.VariableTable
+#
+EXC_UndefinedQueryVariable=Undefined query variable ''{0}''.
+
+#
+# TypeSupport
+#
+EXC_CannotFindField=Cannot find field ''{0}'' of class ''{1}''.
+EXC_CannotAccessField=Cannot access field ''{0}'' of class ''{1}''.
+# {0} - field name
+# {1} - class name
+EXC_CannotChangeAccessibility=A SecurityException was thrown when trying to \
+make field ''{0}'' in class ''{1}'' accessible in order to access its value \
+while executing a query.  In order to execute queries on transient instances, \
+you must grant java.lang.reflect.ReflectPermission("suppressAccessChecks") to \
+the codeBase containing the JDO Reference Implementation (jdori.jar).
+EXC_InstanceBoundToDifferentPM=Instance ''{0}'' not bound to the PersistenceManager of the
query
+#NOI18N
+ERR_CollectionFieldExpected=Collection field expected; field ''{0}'' of class ''{1}'' has
type ''{2}''.
+
+#
+# tree.BinaryExpr
+#
+EXC_IncompatibleTypes=The operands ''{0}'', ''{1}'' for binary expression ''{2}'' have incompatible
types. Change one of the operands.
+
+#
+# tree.CastExpr
+#
+EXC_IllegalCast=Cannot cast ''{0}'' to ''{1}''. Change one of the operands for cast expression
''{2}''.
+
+#
+# tree.MethodCallExpr
+#
+EXC_IllegalNumberOfParameters=Illegal number of parameters supplied for method call ''{0}''.
+
+#
+# tree.ContainsCallExpr
+# tree.IsEmptyCallExpr
+#
+EXC_NoCollectionType=The target expression ''{0}'' must have a collection type for method
call expression ''{1}''. Change the target expression.
+
+#
+# tree.EndsWithCallExpr
+# tree.StartsWithCallExpr
+#
+EXC_NoStringType=The target expression ''{0}'' must have a string type for method call expression
''{1}''. Change the target expression.
+
+#
+# tree.FieldAccessExpr
+#
+EXC_NoSuchField=The identifier ''{0}'' does neither correspond with a declared parameter/variable
nor with a field in class ''{1}''.
+
+#
+# tree.Node
+#
+EXC_CannotProcessNullNodes=Cannot construct node ''{0}'' for children which equal null. Do
not use null arguments in any expression factory methods.
+EXC_CannotReuseNodes=The node ''{0}'' is already used in expression ''{1}''. Cannot reuse
this node in another expression.
+
+#
+# tree.Tree
+#
+EXC_ParameterVariableCollision=You try to declare a parameter having name ''{0}''. This name
is already used by a declared variable.
+EXC_VariableParameterCollision=You try to declare a variable having name ''{0}''. This name
is already used by a declared parameter.
+EXC_IllegalTypeForFilterExpression=Cannot set filter expression ''{0}'' as it returns a non
boolean type.
+EXC_IllegalIdentifier=You cannot create an identifier expression for Java key word. Do not
use ''{0}'' for an identifier.
+EXC_NonSupportedMethodCall=Cannot construct a method call expression for method ''{0}''.
This method is not supported.
+EXC_CannotResolveTokenType=Cannot resolve token type ''{0}''.
+
+#
+# MemoryQuery
+#
+EXC_IllegalResultTypeForExpression=Cannot apply operator ''{0}'' for operands of type ''{1}''.
+EXC_CannotAccessUnboundVariables=Cannot access unbound variable ''{0}''. Unbound variables
do not have a corresponding contains clause.
+EXC_CannotProcessMultipleContainsClauses=Cannot process two contains clauses for the same
binary expression.

Added: incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java?rev=171353&view=auto
==============================================================================
--- incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java
(added)
+++ incubator/jdo/trunk/query20/src/java/org/apache/jdo/impl/jdoql/JDOQLQueryFactoryImpl.java
Sun May 22 11:08:57 2005
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.impl.jdoql;
+
+import java.util.Collection;
+
+import javax.jdo.Extent;
+import javax.jdo.Query;
+
+import org.apache.jdo.impl.jdoql.tree.Tree;
+import org.apache.jdo.jdoql.JDOQLQueryFactory;
+import org.apache.jdo.jdoql.tree.QueryTree;
+import org.apache.jdo.pm.PersistenceManagerInternal;
+
+/**
+ * Implements the @link{QueryFactory} interface 
+ * in order to implement a component which is capable 
+ * to run together with JDO runtime.
+ * 
+ * @author Michael Watzek
+ */
+public class JDOQLQueryFactoryImpl implements JDOQLQueryFactory 
+{
+
+    /** 
+     * Returns a new QueryTree instance. This instance allows to specify a 
+     * query with an API (see {@link org.apache.jdo.jdoql.tree.QueryTree} and 
+     * {@link org.apache.jdo.jdoql.tree.ExpressionFactory}) rather than as
+     * JDOQL strings. To run you create a query object from the QueryTree (see 
+     * {@link javax.jdo.PersistenceManager#newQuery(Object compiled)}) 
+     * and call the execute method on the Query object.
+     * @return new QueryTree instance.
+     */
+    public QueryTree newTree()
+    {
+        return new Tree();
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal)
+     */
+    public Query newQuery(PersistenceManagerInternal pm) 
+    {
+        return new QueryImpl(pm);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
java.lang.Object)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Object compiled) 
+    {
+        return new QueryImpl(pm, compiled);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
java.lang.Class)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Class cls) 
+    {
+        return new QueryImpl(pm, cls);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
javax.jdo.Extent)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Extent cln) 
+    {
+        return new QueryImpl(pm, cln);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
java.lang.Class, java.util.Collection)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Class cls, Collection cln) 
+    {
+        return new QueryImpl(pm, cls, cln);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
java.lang.Class, java.lang.String)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Class cls, String filter) 
+    {
+        return new QueryImpl(pm, cls, filter);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
java.lang.Class, java.util.Collection, java.lang.String)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Class cls, Collection cln, String
filter) 
+    {
+        return new QueryImpl(pm, cls, cln, filter);
+    }
+
+    /*
+     * @see org.apache.jdo.jdoql.QueryFactory#newQuery(org.apache.jdo.pm.PersistenceManagerInternal,
javax.jdo.Extent, java.lang.String)
+     */
+    public Query newQuery(PersistenceManagerInternal pm, Extent cln, String filter) 
+    {
+        return new QueryImpl(pm, cln, filter);
+    }
+}



Mime
View raw message