mkalen 2005/04/10 11:28:21
Modified: src/doc/forrest/src/documentation/content/xdocs/docu/guides
Tag: OJB_1_0_RELEASE deployment.xml
src/java/org/apache/ojb/jdo/jdoql Tag: OJB_1_0_RELEASE
jdoql-ojb-lexer.g jdoql-ojb-parser.g
jdoql-ojb-treeparser.g JDOQLLexer.java
JDOQLParser.java JDOQLParserTokenTypes.java
JDOQLParserTokenTypes.txt JDOQLTokenTypes.java
JDOQLTokenTypes.txt JDOQLTreeParser.java
JDOQLTreeParserTokenTypes.java
JDOQLTreeParserTokenTypes.txt
src/java/org/apache/ojb/odmg/oql Tag: OJB_1_0_RELEASE
oql-ojb.g OQLLexer.java OQLLexerTokenTypes.java
OQLLexerTokenTypes.txt OQLParser.java
src/ojb-blank Tag: OJB_1_0_RELEASE .classpath
. Tag: OJB_1_0_RELEASE .classpath build.xml
release-notes.txt
Added: lib Tag: OJB_1_0_RELEASE antlr-2.7.5.jar
Removed: lib Tag: OJB_1_0_RELEASE antlr-2.7.3.jar
Log:
Upgrade ANTLR to v2.7.5. Re-generate lexers/parsers from *.g. Tweak oql
grammar to optimize some imports. Bump copyright years, update Eclipse
classpaths and docs.
Revision Changes Path
No revision
No revision
1.1.2.1 +1910 -0 db-ojb/lib/Attic/antlr-2.7.5.jar
<<Binary file>>
No revision
No revision
1.1.2.4 +17 -16
db-ojb/src/doc/forrest/src/documentation/content/xdocs/docu/guides/deployment.xml
Index: deployment.xml
===================================================================
RCS file:
/home/cvs/db-ojb/src/doc/forrest/src/documentation/content/xdocs/docu/guides/deployment.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- deployment.xml 8 Sep 2004 22:12:11 -0000 1.1.2.3
+++ deployment.xml 10 Apr 2005 18:28:20 -0000 1.1.2.4
@@ -931,18 +931,19 @@
<p>
<strong>1.</strong> To create a Manifest.mf file
with classpath attribute that include
all the runtime jar required by OJB (Very important
to include all
- required jar). The sample below works fine:
+ required jar). The sample below works fine (replace
[version] with
+ distributed JAR versions):
</p>
<source><![CDATA[
-Class-Path: db-ojb-1.0.rc6.jar antlr-2.7.3.jar commons-beanutils.jar
-commons-collections.jar commons-dbcp-1.1.jar commons-lang-2.0.jar
-commons-logging.jar commons-pool-1.1.jar
-jakarta-regexp-1.3.jar]]></source>
+Class-Path: db-ojb-[version].jar antlr-[version].jar
commons-beanutils-[version].jar
+commons-collections-[version].jar commons-dbcp-[version].jar
commons-lang-[version].jar
+commons-logging-[version].jar commons-pool-[version].jar
+jakarta-regexp-[version].jar]]></source>
<note>
If you to include the jar file under a directory of
the ear file,
- says <code>/lib/db-ojb-1.0.rc6.jar</code> and etc.
At the classpath
+ says <code>/lib/db-ojb-[version].jar</code> and etc.
At the classpath
attribute it will be something like:
- <code>Class-Path: ./lib/db-ojb-1.0.rc6.jar and
etc</code> (The "." in front is
+ <code>Class-Path: ./lib/db-ojb-[version].jar and
etc</code> (The "." in front is
important)
</note>
<p>
@@ -951,28 +952,28 @@
</p>
<source><![CDATA[
<module>
- <java>antlr-2.7.3.jar</java>
+ <java>antlr-[version].jar</java>
</module>
<module>
- <java>commons-beanutils.jar</java>
+ <java>commons-beanutils-[version].jar</java>
</module>
<module>
- <java>commons-collections.jar</java>
+ <java>commons-collections-[version].jar</java>
</module>
<module>
- <java>commons-dbcp-1.1.jar</java>
+ <java>commons-dbcp-[version].jar</java>
</module>
<module>
- <java>commons-lang-2.0.jar</java>
+ <java>commons-lang-[version].jar</java>
</module>
<module>
- <java>commons-logging.jar</java>
+ <java>commons-logging-[version].jar</java>
</module>
<module>
- <java>commons-pool-1.1.jar</java>
+ <java>commons-pool-[version].jar</java>
</module>
<module>
- <java>db-ojb-1.0.rc6.jar</java>
+ <java>db-ojb-[version].jar</java>
</module>]]></source>
<note>
To use this approach, all the library had to be in the
root of the
No revision
No revision
1.5.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-lexer.g
Index: jdoql-ojb-lexer.g
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-lexer.g,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- jdoql-ojb-lexer.g 16 May 2004 22:15:46 -0000 1.5
+++ jdoql-ojb-lexer.g 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -2,7 +2,7 @@
{
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.5.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-parser.g
Index: jdoql-ojb-parser.g
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-parser.g,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- jdoql-ojb-parser.g 16 May 2004 22:15:46 -0000 1.5
+++ jdoql-ojb-parser.g 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -2,7 +2,7 @@
{
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.4.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-treeparser.g
Index: jdoql-ojb-treeparser.g
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/jdoql-ojb-treeparser.g,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- jdoql-ojb-treeparser.g 23 May 2004 12:02:29 -0000 1.4
+++ jdoql-ojb-treeparser.g 10 Apr 2005 18:28:20 -0000 1.4.2.1
@@ -2,7 +2,7 @@
{
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.4.2.1 +2 -2 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java
Index: JDOQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLLexer.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- JDOQLLexer.java 13 May 2004 21:37:08 -0000 1.4
+++ JDOQLLexer.java 10 Apr 2005 18:28:20 -0000 1.4.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-lexer.g" -> "JDOQLLexer.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-lexer.g" -> "JDOQLLexer.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.5.2.1 +2 -2 db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java
Index: JDOQLParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParser.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JDOQLParser.java 16 May 2004 22:15:46 -0000 1.5
+++ JDOQLParser.java 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-parser.g" -> "JDOQLParser.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-parser.g" -> "JDOQLParser.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.5.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParserTokenTypes.java
Index: JDOQLParserTokenTypes.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParserTokenTypes.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JDOQLParserTokenTypes.java 16 May 2004 22:15:46 -0000 1.5
+++ JDOQLParserTokenTypes.java 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-parser.g" -> "JDOQLParser.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-parser.g" -> "JDOQLParser.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.5.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParserTokenTypes.txt
Index: JDOQLParserTokenTypes.txt
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLParserTokenTypes.txt,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JDOQLParserTokenTypes.txt 16 May 2004 22:15:46 -0000 1.5
+++ JDOQLParserTokenTypes.txt 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.3: jdoql-ojb-parser.g -> JDOQLParserTokenTypes.txt$
+// $ANTLR 2.7.5 (20050128): jdoql-ojb-parser.g -> JDOQLParserTokenTypes.txt$
JDOQLParser // output token vocab name
PARAMETERS=4
PARAMETER=5
1.5.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTokenTypes.java
Index: JDOQLTokenTypes.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTokenTypes.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JDOQLTokenTypes.java 16 May 2004 22:15:46 -0000 1.5
+++ JDOQLTokenTypes.java 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-lexer.g" -> "JDOQLLexer.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-lexer.g" -> "JDOQLLexer.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.5.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTokenTypes.txt
Index: JDOQLTokenTypes.txt
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTokenTypes.txt,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- JDOQLTokenTypes.txt 16 May 2004 22:15:46 -0000 1.5
+++ JDOQLTokenTypes.txt 10 Apr 2005 18:28:20 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.3: jdoql-ojb-lexer.g -> JDOQLTokenTypes.txt$
+// $ANTLR 2.7.5 (20050128): jdoql-ojb-lexer.g -> JDOQLTokenTypes.txt$
JDOQL // output token vocab name
PARAMETERS=4
PARAMETER=5
1.4.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java
Index: JDOQLTreeParser.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParser.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- JDOQLTreeParser.java 23 May 2004 12:02:29 -0000 1.4
+++ JDOQLTreeParser.java 10 Apr 2005 18:28:20 -0000 1.4.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-treeparser.g" -> "JDOQLTreeParser.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-treeparser.g" ->
"JDOQLTreeParser.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.3.2.1 +2 -2
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.java
Index: JDOQLTreeParserTokenTypes.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JDOQLTreeParserTokenTypes.java 16 May 2004 22:15:46 -0000 1.3
+++ JDOQLTreeParserTokenTypes.java 10 Apr 2005 18:28:20 -0000 1.3.2.1
@@ -1,8 +1,8 @@
-// $ANTLR 2.7.3: "jdoql-ojb-treeparser.g" -> "JDOQLTreeParser.java"$
+// $ANTLR 2.7.5 (20050128): "jdoql-ojb-treeparser.g" ->
"JDOQLTreeParser.java"$
package org.apache.ojb.jdo.jdoql;
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-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.
1.3.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.txt
Index: JDOQLTreeParserTokenTypes.txt
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/jdo/jdoql/JDOQLTreeParserTokenTypes.txt,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JDOQLTreeParserTokenTypes.txt 16 May 2004 22:15:46 -0000 1.3
+++ JDOQLTreeParserTokenTypes.txt 10 Apr 2005 18:28:20 -0000 1.3.2.1
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.3: jdoql-ojb-treeparser.g -> JDOQLTreeParserTokenTypes.txt$
+// $ANTLR 2.7.5 (20050128): jdoql-ojb-treeparser.g ->
JDOQLTreeParserTokenTypes.txt$
JDOQLTreeParser // output token vocab name
PARAMETERS=4
PARAMETER=5
No revision
No revision
1.23.2.1 +40 -14 db-ojb/src/java/org/apache/ojb/odmg/oql/oql-ojb.g
Index: oql-ojb.g
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/oql-ojb.g,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- oql-ojb.g 1 Jun 2004 19:15:23 -0000 1.23
+++ oql-ojb.g 10 Apr 2005 18:28:21 -0000 1.23.2.1
@@ -51,40 +51,52 @@
*
*/
+/* mkalen: Notice from the original mdbs oql.g (do not touch Antlr version):
*/
/*
** oql.g
**
-** Built with Antlr 2.7.1
+** Built with Antlr 2.5
** java antlr.Tool ojb-oql.g
*/
header{
-/*
+/* Copyright 2003-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.ojb.odmg.oql;
+
+}
+
+/**
* This OQL grammar has been derived from a OQL sample grammar from the ODMG
* WebSite. The original grammar is copyright protected by MicroData Base
* Systems: Copyright (c) 1999 Micro Data Base Systems, Inc. All rights
* reserved.
*
- * The original grammar has been modified to fit into the ObJectBridge (OJB)
+ * The original grammar has been modified to fit into the OJB
* Persistence Managment System.
*
- * Modifications done by Ch. Rath & Th. Mahler & S. Harris
+ * Modifications done by Ch. Rath, Th. Mahler, S. Harris and many others.
*
* This grammar can be used to build an OQL Parser with the ANTLR Parser
* construction set.
* The grammar defines a Parser that translates valid OQL Strings
* into ojb.broker.query.Query Objects. These query objects can be used
* to perform database queries by means of the OJB PersistenceBroker.
- * @see ojb.server.oql.OQLQueryImpl for implementation details.
+ * @see org.apache.ojb.odmg.oql.OQLQueryImpl for implementation details.
+ * @version $Id$
*/
-package org.apache.ojb.odmg.oql;
-
-import org.apache.ojb.broker.query.*;
-import org.apache.ojb.broker.metadata.*;
-import org.apache.ojb.broker.*;
-import org.apache.ojb.broker.util.ClassHelper;
-import java.util.*;
-}
-
class OQLLexer extends Lexer ;
options {
k = 2;
@@ -323,6 +335,20 @@
{ $setType(Token.SKIP); }
;
+{
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Vector;
+
+import org.apache.ojb.broker.metadata.ClassDescriptor;
+import org.apache.ojb.broker.metadata.MetadataManager;
+import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
+import org.apache.ojb.broker.util.ClassHelper;
+import org.apache.ojb.broker.query.Criteria;
+import org.apache.ojb.broker.query.Query;
+import org.apache.ojb.broker.query.QueryByCriteria;
+import org.apache.ojb.broker.query.QueryFactory;
+}
class OQLParser extends Parser ;
options {
k = 3;
1.19.2.1 +31 -20 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
Index: OQLLexer.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- OQLLexer.java 1 Jun 2004 19:15:23 -0000 1.19
+++ OQLLexer.java 10 Apr 2005 18:28:21 -0000 1.19.2.1
@@ -1,30 +1,22 @@
-// $ANTLR 2.7.3: "oql-ojb.g" -> "OQLLexer.java"$
+// $ANTLR 2.7.5 (20050128): "oql-ojb.g" -> "OQLLexer.java"$
-/*
- * This OQL grammar has been derived from a OQL sample grammar from the ODMG
- * WebSite. The original grammar is copyright protected by MicroData Base
- * Systems: Copyright (c) 1999 Micro Data Base Systems, Inc. All rights
- * reserved.
+/* Copyright 2003-2005 The Apache Software Foundation
*
- * The original grammar has been modified to fit into the ObJectBridge (OJB)
- * Persistence Managment System.
+ * 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
*
- * Modifications done by Ch. Rath & Th. Mahler & S. Harris
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This grammar can be used to build an OQL Parser with the ANTLR Parser
- * construction set.
- * The grammar defines a Parser that translates valid OQL Strings
- * into ojb.broker.query.Query Objects. These query objects can be used
- * to perform database queries by means of the OJB PersistenceBroker.
- * @see ojb.server.oql.OQLQueryImpl for implementation details.
+ * 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.ojb.odmg.oql;
-import org.apache.ojb.broker.query.*;
-import org.apache.ojb.broker.metadata.*;
-import org.apache.ojb.broker.*;
-import org.apache.ojb.broker.util.ClassHelper;
-import java.util.*;
import java.io.InputStream;
import antlr.TokenStreamException;
@@ -50,6 +42,25 @@
import antlr.collections.impl.BitSet;
import antlr.SemanticException;
+/**
+ * This OQL grammar has been derived from a OQL sample grammar from the ODMG
+ * WebSite. The original grammar is copyright protected by MicroData Base
+ * Systems: Copyright (c) 1999 Micro Data Base Systems, Inc. All rights
+ * reserved.
+ *
+ * The original grammar has been modified to fit into the OJB
+ * Persistence Managment System.
+ *
+ * Modifications done by Ch. Rath, Th. Mahler, S. Harris and many others.
+ *
+ * This grammar can be used to build an OQL Parser with the ANTLR Parser
+ * construction set.
+ * The grammar defines a Parser that translates valid OQL Strings
+ * into ojb.broker.query.Query Objects. These query objects can be used
+ * to perform database queries by means of the OJB PersistenceBroker.
+ * @see org.apache.ojb.odmg.oql.OQLQueryImpl for implementation details.
+ * @version $Id$
+ */
public class OQLLexer extends antlr.CharScanner implements
OQLLexerTokenTypes, TokenStream
{
public OQLLexer(InputStream in) {
1.14.2.1 +12 -20
db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java
Index: OQLLexerTokenTypes.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- OQLLexerTokenTypes.java 1 Jun 2004 19:15:23 -0000 1.14
+++ OQLLexerTokenTypes.java 10 Apr 2005 18:28:21 -0000 1.14.2.1
@@ -1,30 +1,22 @@
-// $ANTLR 2.7.3: "oql-ojb.g" -> "OQLParser.java"$
+// $ANTLR 2.7.5 (20050128): "oql-ojb.g" -> "OQLParser.java"$
-/*
- * This OQL grammar has been derived from a OQL sample grammar from the ODMG
- * WebSite. The original grammar is copyright protected by MicroData Base
- * Systems: Copyright (c) 1999 Micro Data Base Systems, Inc. All rights
- * reserved.
+/* Copyright 2003-2005 The Apache Software Foundation
*
- * The original grammar has been modified to fit into the ObJectBridge (OJB)
- * Persistence Managment System.
+ * 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
*
- * Modifications done by Ch. Rath & Th. Mahler & S. Harris
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This grammar can be used to build an OQL Parser with the ANTLR Parser
- * construction set.
- * The grammar defines a Parser that translates valid OQL Strings
- * into ojb.broker.query.Query Objects. These query objects can be used
- * to perform database queries by means of the OJB PersistenceBroker.
- * @see ojb.server.oql.OQLQueryImpl for implementation details.
+ * 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.ojb.odmg.oql;
-import org.apache.ojb.broker.query.*;
-import org.apache.ojb.broker.metadata.*;
-import org.apache.ojb.broker.*;
-import org.apache.ojb.broker.util.ClassHelper;
-import java.util.*;
public interface OQLLexerTokenTypes {
int EOF = 1;
1.5.2.1 +1 -1
db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.txt
Index: OQLLexerTokenTypes.txt
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.txt,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- OQLLexerTokenTypes.txt 9 Apr 2004 13:22:29 -0000 1.5
+++ OQLLexerTokenTypes.txt 10 Apr 2005 18:28:21 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-// $ANTLR 2.7.3: oql-ojb.g -> OQLLexerTokenTypes.txt$
+// $ANTLR 2.7.5 (20050128): oql-ojb.g -> OQLLexerTokenTypes.txt$
OQLLexer // output token vocab name
TOK_RPAREN("right parenthesis")=4
TOK_LPAREN("left parenthesis")=5
1.26.2.1 +48 -66 db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java
Index: OQLParser.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- OQLParser.java 1 Jun 2004 19:15:23 -0000 1.26
+++ OQLParser.java 10 Apr 2005 18:28:21 -0000 1.26.2.1
@@ -1,30 +1,22 @@
-// $ANTLR 2.7.3: "oql-ojb.g" -> "OQLParser.java"$
+// $ANTLR 2.7.5 (20050128): "oql-ojb.g" -> "OQLParser.java"$
-/*
- * This OQL grammar has been derived from a OQL sample grammar from the ODMG
- * WebSite. The original grammar is copyright protected by MicroData Base
- * Systems: Copyright (c) 1999 Micro Data Base Systems, Inc. All rights
- * reserved.
+/* Copyright 2003-2005 The Apache Software Foundation
*
- * The original grammar has been modified to fit into the ObJectBridge (OJB)
- * Persistence Managment System.
+ * 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
*
- * Modifications done by Ch. Rath & Th. Mahler & S. Harris
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This grammar can be used to build an OQL Parser with the ANTLR Parser
- * construction set.
- * The grammar defines a Parser that translates valid OQL Strings
- * into ojb.broker.query.Query Objects. These query objects can be used
- * to perform database queries by means of the OJB PersistenceBroker.
- * @see ojb.server.oql.OQLQueryImpl for implementation details.
+ * 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.ojb.odmg.oql;
-import org.apache.ojb.broker.query.*;
-import org.apache.ojb.broker.metadata.*;
-import org.apache.ojb.broker.*;
-import org.apache.ojb.broker.util.ClassHelper;
-import java.util.*;
import antlr.TokenBuffer;
import antlr.TokenStreamException;
@@ -40,6 +32,19 @@
import antlr.ParserSharedInputState;
import antlr.collections.impl.BitSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Vector;
+
+import org.apache.ojb.broker.metadata.ClassDescriptor;
+import org.apache.ojb.broker.metadata.MetadataManager;
+import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
+import org.apache.ojb.broker.util.ClassHelper;
+import org.apache.ojb.broker.query.Criteria;
+import org.apache.ojb.broker.query.Query;
+import org.apache.ojb.broker.query.QueryByCriteria;
+import org.apache.ojb.broker.query.QueryFactory;
+
public class OQLParser extends antlr.LLkParser implements
OQLLexerTokenTypes
{
@@ -86,8 +91,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_0);
+ recover(ex,_tokenSet_0);
}
return query;
}
@@ -207,8 +211,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_4);
+ recover(ex,_tokenSet_4);
}
return query;
}
@@ -280,8 +283,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_5);
+ recover(ex,_tokenSet_5);
}
return projectionAttrs;
}
@@ -303,8 +305,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_6);
+ recover(ex,_tokenSet_6);
}
return clazz;
}
@@ -319,8 +320,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -347,8 +347,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_2);
+ recover(ex,_tokenSet_2);
}
}
@@ -375,8 +374,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_3);
+ recover(ex,_tokenSet_3);
}
}
@@ -403,8 +401,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_4);
+ recover(ex,_tokenSet_4);
}
}
@@ -441,8 +438,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
return query;
}
@@ -472,8 +468,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -521,8 +516,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_10);
+ recover(ex,_tokenSet_10);
}
}
@@ -541,8 +535,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_11);
+ recover(ex,_tokenSet_11);
}
}
@@ -561,8 +554,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_12);
+ recover(ex,_tokenSet_12);
}
}
@@ -591,8 +583,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -642,8 +633,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -757,8 +747,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -799,8 +788,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -840,8 +828,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -885,8 +872,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -938,8 +924,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -990,8 +975,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
}
@@ -1104,8 +1088,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_17);
+ recover(ex,_tokenSet_17);
}
return value;
}
@@ -1153,8 +1136,7 @@
}
catch (RecognitionException ex) {
reportError(ex);
- consume();
- consumeUntil(_tokenSet_7);
+ recover(ex,_tokenSet_7);
}
return coll;
}
No revision
No revision
1.2.2.4 +5 -5 db-ojb/src/ojb-blank/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/src/ojb-blank/.classpath,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- .classpath 29 Nov 2004 20:43:13 -0000 1.2.2.3
+++ .classpath 10 Apr 2005 18:28:21 -0000 1.2.2.4
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/java"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.3.jar"/>
- <classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
+ <classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
+ <classpathentry kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-2.1.1.jar"/>
- <classpathentry kind="lib" path="lib/commons-dbcp-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-dbcp-1.2.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/commons-pool-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/commons-pool-1.2.jar"/>
<classpathentry kind="lib" path="lib/@OJB_JAR@"/>
<classpathentry kind="lib" path="lib/hsqldb.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
No revision
No revision
1.35.2.8 +1 -1 db-ojb/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/db-ojb/.classpath,v
retrieving revision 1.35.2.7
retrieving revision 1.35.2.8
diff -u -r1.35.2.7 -r1.35.2.8
--- .classpath 10 Apr 2005 11:52:37 -0000 1.35.2.7
+++ .classpath 10 Apr 2005 18:28:21 -0000 1.35.2.8
@@ -31,7 +31,7 @@
<classpathentry kind="lib" path="lib/torque-3.0.2.jar"/>
<classpathentry kind="lib" path="lib/velocity-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/prevayler.jar"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.3.jar"/>
+ <classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
<classpathentry kind="lib"
path="samples/tutorial1-struts/lib/struts.jar"/>
<classpathentry kind="lib" path="lib/geronimo-spec-j2ee-1.4-rc2.jar"/>
<classpathentry kind="lib" path="lib/ant-1.6.2.jar"/>
1.144.2.22 +24 -9 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.144.2.21
retrieving revision 1.144.2.22
diff -u -r1.144.2.21 -r1.144.2.22
--- build.xml 25 Feb 2005 21:00:19 -0000 1.144.2.21
+++ build.xml 10 Apr 2005 18:28:21 -0000 1.144.2.22
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-/* Copyright 2002-2004 Apache Software Foundation
+/* Copyright 2002-2005 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.
@@ -20,7 +20,6 @@
<!--
ObJectRelationalBridge ANT build configuration.
initial author: Thomas Mahler
- contains modifications by Chris Greenlee and others.
-->
<project name="ObJectRelationalBridge" default="all" basedir=".">
@@ -1135,7 +1134,6 @@
<!-- property 'test.package' has to be set at command line -->
<target name="run-test" depends="prepare-repository, copy-testdb">
<junit printsummary="yes" showoutput="true" fork="yes"
dir="${build.test}/ojb">
- <jvmarg value="-DOJB.bootLogLevel=INFO" />
<classpath refid="runtime-classpath"/>
<formatter type="plain" />
<test name="${test.package}"
@@ -1153,7 +1151,6 @@
<target name="junit-no-compile-no-prepare" unless="ojb.testsToRun">
<junit printsummary="yes" fork="yes" dir="${build.test}/ojb">
- <jvmarg value="-DOJB.bootLogLevel=INFO" />
<jvmarg value="-DOJB.skip.issues=${OJB.skip.issues}" />
<classpath refid="runtime-classpath"/>
<formatter type="plain" />
@@ -1184,7 +1181,6 @@
<target name="junit-no-compile-no-prepare-selected" if="ojb.testsToRun">
<junit printsummary="yes" fork="yes" dir="${build.test}/ojb">
- <jvmarg value="-DOJB.bootLogLevel=INFO" />
<jvmarg value="-DOJB.skip.issues=${OJB.skip.issues}" />
<classpath refid="runtime-classpath"/>
<formatter type="plain" />
@@ -1218,7 +1214,6 @@
<!-- todo: maybe let them run in an extra directory -->
<target name="junit-sqlcount-no-compile-no-prepare" depends="checkP6Spy"
if="shouldUseP6Spy">
<junit printsummary="yes" fork="yes" dir="${build.test}/ojb">
- <jvmarg value="-DOJB.bootLogLevel=INFO" />
<jvmarg value="-DOJB.skip.issues=${OJB.skip.issues}" />
<classpath refid="runtime-classpath"/>
<formatter type="plain" />
@@ -1434,9 +1429,8 @@
</java>
</target>
-
<!-- ==================================================================
-->
- <!-- build OQL Parser classes from oql-ojb.g grammar
-->
+ <!-- Build OQL Parser classes from oql-ojb.g grammar
-->
<!-- ==================================================================
-->
<target name="oql" depends="init"
description="Builds OQL parser sources from ANTLR grammar file.">
@@ -1447,6 +1441,27 @@
</java>
</target>
+ <!-- ==================================================================
-->
+ <!-- Build JDO lexer/parser classes from jdoql-ojb-*.g grammars
-->
+ <!-- ==================================================================
-->
+ <target name="jdoql" depends="init"
+ description="Builds JDO lexer/parser sources from ANTLR grammar
files.">
+ <java fork="yes" classname="antlr.Tool"
dir="${src.java}/org/apache/ojb/jdo/jdoql"
+ taskname="build jdoql lexer" failonerror="true" >
+ <classpath refid="compilation-classpath"/>
+ <arg value="jdoql-ojb-lexer.g" />
+ </java>
+ <java fork="yes" classname="antlr.Tool"
dir="${src.java}/org/apache/ojb/jdo/jdoql"
+ taskname="build jdoql parser" failonerror="true" >
+ <classpath refid="compilation-classpath"/>
+ <arg value="jdoql-ojb-parser.g" />
+ </java>
+ <java fork="yes" classname="antlr.Tool"
dir="${src.java}/org/apache/ojb/jdo/jdoql"
+ taskname="build jdoql tree-parser" failonerror="true" >
+ <classpath refid="compilation-classpath"/>
+ <arg value="jdoql-ojb-treeparser.g" />
+ </java>
+ </target>
<target name="declare" depends="main">
<taskdef name="verifymappings"
classname="org.apache.ojb.broker.ant.VerifyMappingsTask">
1.54.2.44 +2 -1 db-ojb/release-notes.txt
Index: release-notes.txt
===================================================================
RCS file: /home/cvs/db-ojb/release-notes.txt,v
retrieving revision 1.54.2.43
retrieving revision 1.54.2.44
diff -u -r1.54.2.43 -r1.54.2.44
--- release-notes.txt 7 Apr 2005 13:10:06 -0000 1.54.2.43
+++ release-notes.txt 10 Apr 2005 18:28:21 -0000 1.54.2.44
@@ -22,6 +22,7 @@
NOTES:
CHANGES:
+* Upgraded ANTLR to v2.7.5 (OQL and JDOQL parser classes have been
re-generated)
* Upgraded commons-dbcp to v1.2.1
* Upgraded commons-pool to v1.2
* Upgraded commons-beanutils to v1.7
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
