db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Antonio Gallardo" <agalla...@agssa.net>
Subject Re: cvs commit: db-ojb .classpath build.xml release-notes.txt
Date Mon, 11 Apr 2005 06:20:23 GMT
Hi:

I found small concerns in this commmit, please read comments between lines.

On Dom, 10 de Abril de 2005, 13:28, mkalen@apache.org dijo:
> mkalen      2005/04/10 11:28:21
>   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.

>   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
                         ^^^
                         |||
                         2.7.5

Please fix. ;-)

>    **   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
                                                               ^^^
                                                               |||
Should be "Apache 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.
>     *
>   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

Is correct to change here the Copyright?

>     *
>   - * 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.
>     */
>
>   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

Again a Copyright change. :-)

>     *
>   - * 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.
>     */
>   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

Again, a Copyright change.

>     *
>   - * 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.
>
>     */
>   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.

Copyright or a notice changed?

Best Regards,

Antonio Gallardo

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message