From aaafb116f81536ca6f842885f4a64fbc3c345b99 Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 9 Dec 2002 16:29:44 +0000 Subject: [PATCH] Change project-name capitalisation from "cql-java" to "CQL-Java". Add a note to the effect, and a note on the changes to the anchoring properties in etc/pqf.properties, to the Changes file. Downgrade the VERSION file for the next release from 0.5 "proper" to 0.5-RC1, since I want to get Ralph to test it before release. --- Changes | 13 +++++++++++-- README | 16 ++++++++-------- VERSION | 2 +- lib/README | 4 ++-- mkdist | 4 ++-- src/org/z3950/zing/cql/CQLNode.java | 8 ++++---- src/org/z3950/zing/cql/Makefile | 4 ++-- test/random/README | 12 ++++++------ test/regression/README | 8 ++++---- 9 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Changes b/Changes index b804262..66e9d13 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ -$Id: Changes,v 1.23 2002-12-04 16:55:45 mike Exp $ +$Id: Changes,v 1.24 2002-12-09 16:29:44 mike Exp $ -Revision history for the "cql-java" package. +Revision history for the CQL-Java package. See the bottom of this file for a list of things still to do. 0.5 (IN PROGRESS) @@ -11,9 +11,18 @@ See the bottom of this file for a list of things still to do. APDU. This was contributed by Ralph Levan - Change regression-test rules for Adam's compiler to use his new front-end cql2xcql instead of the old cqlparse3. + - Change the names of the anchoring properties in + etc/pqf.properties and the CQLTermNode code that examines + them, in accordance with Adam's PQF-renderer's behaviour. + This gives more flexibility in terms of generating + attributes for end-of-field anchoring. - Fix comment in etc/pqf.properties (claimed that the Type-1 "string" attribute was "phrase"). Just a documentation error. + - Change the capitalisation of the project name from + "cql-java" to "CQL-Java". That doesn't really make any + difference to anything: in particular, file-names such as + "cql-java.jar" remain the same. 0.4 Thu Nov 21 10:09:26 2002 - Add support for the new "phonetic" relation modifier, diff --git a/README b/README index cdfa3ee..9f940c2 100644 --- a/README +++ b/README @@ -1,12 +1,12 @@ -$Id: README,v 1.21 2002-11-20 09:49:28 mike Exp $ +$Id: README,v 1.22 2002-12-09 16:29:44 mike Exp $ -cql-java - a free CQL compiler, and other CQL tools, for Java +CQL-Java - a free CQL compiler, and other CQL tools, for Java INTRODUCTION ------------ -cql-java is a Free Software project that provides: +CQL-Java is a Free Software project that provides: * A set of classes for representing a CQL parse tree (a base CQLNode class, CQLBooleanNode and its subclasses, CQLTermNode, etc.) @@ -37,7 +37,7 @@ What's what in this distribution? README This file VERSION The version-number of this distribution - src Source-code for the cql-java library + src Source-code for the CQL-Java library lib The compiled library file, "cql-java.jar" bin Simple shell-scripts to invoke the test-harnesses docs Documentation automatically generated by "javadoc" @@ -100,18 +100,18 @@ stories and, of course, large cash donations. LICENCE ------- -The cql-java suite is Free Software, which is pretty much legally +The CQL-Java suite is Free Software, which is pretty much legally equivalent -- though not morally equivalent -- to Open Source. See http://www.gnu.org/philosophy/free-software-for-freedom.html for a detailed if somewhat one-sided discussion of the differences, and particularly of why Free Software is an important idea. -cql-java is distributed under version 2.1 of the LGPL (GNU LESSER +CQL-Java is distributed under version 2.1 of the LGPL (GNU LESSER GENERAL PUBLIC LICENSE). A copy of the licence is included in this distribution, as the file LGPL-2.1. This licence does not allow you -to restrict the freedom of others to use derived versions of cql-java +to restrict the freedom of others to use derived versions of CQL-Java (i.e. you must share your enhancements), but does let you deploy -cql-java as a part of a non-free larger work. +CQL-Java as a part of a non-free larger work. SEE ALSO diff --git a/VERSION b/VERSION index 2eb3c4f..82b97c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5 +0.5-RC1 diff --git a/lib/README b/lib/README index 6b38df4..3bc0875 100644 --- a/lib/README +++ b/lib/README @@ -1,5 +1,5 @@ -$Id: README,v 1.1 2002-11-03 16:49:38 mike Exp $ +$Id: README,v 1.2 2002-12-09 16:29:44 mike Exp $ The library file "cql-java.jar" will appear here when you do a build in ../src/org/z3950/zing/cql. Put it on your CLASSPATH to use the -cql-java utilities. +CQL-Java utilities. diff --git a/mkdist b/mkdist index 527134c..2331bee 100755 --- a/mkdist +++ b/mkdist @@ -1,7 +1,7 @@ #!/bin/sh -# mkdist - make a distribution of the cql-java software -# $Id: mkdist,v 1.2 2002-11-21 10:11:08 mike Exp $ +# mkdist - make a distribution of the CQL-Java software +# $Id: mkdist,v 1.3 2002-12-09 16:29:44 mike Exp $ version=`cat VERSION` distdir=cql-java-$version diff --git a/src/org/z3950/zing/cql/CQLNode.java b/src/org/z3950/zing/cql/CQLNode.java index 69b57f7..e0fba9d 100644 --- a/src/org/z3950/zing/cql/CQLNode.java +++ b/src/org/z3950/zing/cql/CQLNode.java @@ -1,4 +1,4 @@ -// $Id: CQLNode.java,v 1.18 2002-12-08 00:37:54 mike Exp $ +// $Id: CQLNode.java,v 1.19 2002-12-09 16:29:44 mike Exp $ package org.z3950.zing.cql; import java.util.Properties; @@ -8,7 +8,7 @@ import java.util.Vector; /** * Represents a node in a CQL parse-tree. * - * @version $Id: CQLNode.java,v 1.18 2002-12-08 00:37:54 mike Exp $ + * @version $Id: CQLNode.java,v 1.19 2002-12-09 16:29:44 mike Exp $ */ public abstract class CQLNode { CQLNode() {} // prevent javadoc from documenting this @@ -71,7 +71,7 @@ public abstract class CQLNode { * A Properties object containing configuration * information that specifies the mapping from CQL qualifiers, * relations, etc. to Type-1 attributes. The mapping - * specification is described in the cql-java distribution's + * specification is described in the CQL-Java distribution's * sample PQF-mapping configuration file, * etc/pqf.properties, which see. * @return @@ -103,7 +103,7 @@ public abstract class CQLNode { * A Properties object containing configuration * information that specifies the mapping from CQL qualifiers, * relations, etc. to Type-1 attributes. The mapping - * specification is described in the cql-java distribution's + * specification is described in the CQL-Java distribution's * sample PQF-mapping configuration file, * etc/pqf.properties, which see. * @return diff --git a/src/org/z3950/zing/cql/Makefile b/src/org/z3950/zing/cql/Makefile index 1394928..910fba8 100644 --- a/src/org/z3950/zing/cql/Makefile +++ b/src/org/z3950/zing/cql/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.12 2002-11-17 23:29:02 mike Exp $ +# $Id: Makefile,v 1.13 2002-12-09 16:29:44 mike Exp $ # # Your Java compiler will require that this source directory is on the -# classpath. The best way to do that is just to add the cql-java +# classpath. The best way to do that is just to add the CQL-Java # distribution's "src" subdirectory to your CLASSPATH environment # variable, like this: # CLASSPATH=$CLASSPATH:/where/ever/you/unpacked/it/cql-java-VERSION/src diff --git a/test/random/README b/test/random/README index 0b09089..98e7c7f 100644 --- a/test/random/README +++ b/test/random/README @@ -1,6 +1,6 @@ -$Id: README,v 1.1 2002-11-03 16:49:38 mike Exp $ +$Id: README,v 1.2 2002-12-09 16:29:44 mike Exp $ -In this directory, we test the integrity of the cql-java tools as +In this directory, we test the integrity of the CQL-Java tools as follows: * Generate a random tree with CQLGenerate @@ -8,8 +8,8 @@ follows: * Canonicalise it with CQLparser -c. * Compare the before-and-after versions. - Since the CQLGenerate output is in canonical form anyway, the - before-and-after versions should be identical. This process - exercises the comprehensiveness and bullet-proofing of the parser, - as well as the accuracy of the rendering. +Since the CQLGenerate output is in canonical form anyway, the +before-and-after versions should be identical. This process exercises +the comprehensiveness and bullet-proofing of the parser, as well as +the accuracy of the rendering. diff --git a/test/regression/README b/test/regression/README index e416798..a773182 100644 --- a/test/regression/README +++ b/test/regression/README @@ -1,6 +1,6 @@ -$Id: README,v 1.5 2002-11-21 09:57:28 mike Exp $ +$Id: README,v 1.6 2002-12-09 16:29:44 mike Exp $ -cql-java's regression-testing framework +CQL-Java's regression-testing framework --------------------------------------- "queries.raw" is the file of test queries as provided by Rob. @@ -21,7 +21,7 @@ contain the trusted compiler output of your choice. "runtests" compares the output of a nominated CQL compiler with existing XCQL files. Most often, you'll use this to compare the -results of your own build of cql-java with those of my build. I'll +results of your own build of CQL-Java with those of my build. I'll use it to test new versions, and people who've written other compilers can use it to test their code. @@ -34,7 +34,7 @@ whatever CQL and/or XCQL files it needs; if you do "make refclean" first, then the next "make" will rebuild the reference results. So, for example, if you think Rob Sanderson's parser, CQLParser.py, is -reliable, and you want to test my parser, cql-java's CQLParser class, +reliable, and you want to test my parser, CQL-Java's CQLParser class, against its results, do this: make refclean -- 1.7.10.4