diff --git a/build.xml b/build.xml
index 58b3860..c9617fa 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <!--
-  == $Id: //open/mondrian/build.xml#122 $
+  == $Id$
   == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
   == http://www.opensource.org/licenses/cpl.html.
diff --git a/doc/deployDoc.sh b/doc/deployDoc.sh
index 2714495..5571a88 100755
--- a/doc/deployDoc.sh
+++ b/doc/deployDoc.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: //open/mondrian/doc/deployDoc.sh#3 $
+# $Id$
 # This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
 # http://www.opensource.org/licenses/cpl.html.
diff --git a/doc/olap4j_fs.html b/doc/olap4j_fs.html
index 2211b72..22c6ae7 100644
--- a/doc/olap4j_fs.html
+++ b/doc/olap4j_fs.html
@@ -80,7 +80,7 @@ <h1>olap4j Functional Specification</h1>
 
 <p>Author(s): Julian Hyde, Barry Klawans<br>
 Version: 0.6-dev (draft)<br>
-Revision: $Id: $
+Revision: $Id$
 (<a href="http://svn.sourceforge.net/viewvc/olap4j/trunk/doc/olap4j_fs.html?view=log">log</a>)<br>
 Last modified: June 10<sup>th</sup>, 2007.</p>
 <hr noshade="noshade">
diff --git a/src/mondrian/olap4j/AbstractNamedList.java b/src/mondrian/olap4j/AbstractNamedList.java
index cb90afd..caf8ed5 100644
--- a/src/mondrian/olap4j/AbstractNamedList.java
+++ b/src/mondrian/olap4j/AbstractNamedList.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  * @see mondrian.olap4j.NamedListImpl
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 25, 2007
  */
 abstract class AbstractNamedList<T extends Named>
diff --git a/src/mondrian/olap4j/EmptyResultSet.java b/src/mondrian/olap4j/EmptyResultSet.java
index f848b6b..1ea609a 100644
--- a/src/mondrian/olap4j/EmptyResultSet.java
+++ b/src/mondrian/olap4j/EmptyResultSet.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -21,7 +21,7 @@
  * <code>EmptyResultSet</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class EmptyResultSet implements ResultSet {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCatalog.java b/src/mondrian/olap4j/MondrianOlap4jCatalog.java
index 51c823b..7779a79 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCatalog.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCatalog.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * Implementation of {@link org.olap4j.metadata.Catalog} for Mondrian.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 23, 2007
  */
 class MondrianOlap4jCatalog implements Catalog, Named {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCell.java b/src/mondrian/olap4j/MondrianOlap4jCell.java
index 2fb9648..4f2a7d5 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCell.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCell.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  * <code>MondrianOlap4jCell</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jCell implements Cell {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSet.java b/src/mondrian/olap4j/MondrianOlap4jCellSet.java
index ff769df..0c7771a 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCellSet.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSet.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -28,7 +28,7 @@
  * <code>MondrianOlap4jCellSet</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jCellSet implements CellSet, CellSetMetaData {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java b/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
index 0ebc035..e01c69a 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -21,7 +21,7 @@
  * <code>MondrianOlap4jCellSetAxis</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jCellSetAxis implements CellSetAxis, CellSetAxisMetaData {
diff --git a/src/mondrian/olap4j/MondrianOlap4jConnection.java b/src/mondrian/olap4j/MondrianOlap4jConnection.java
index 4737518..bfdadd7 100644
--- a/src/mondrian/olap4j/MondrianOlap4jConnection.java
+++ b/src/mondrian/olap4j/MondrianOlap4jConnection.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -27,7 +27,7 @@
  * <code>MondrianOlap4jConnection</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 23, 2007
  */
 class MondrianOlap4jConnection implements OlapConnection {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCube.java b/src/mondrian/olap4j/MondrianOlap4jCube.java
index e0cee13..b952486 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCube.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCube.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  * <code>MondrianOlap4jCube</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jCube implements Cube, Named {
diff --git a/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java b/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
index e0f5eb8..e238139 100644
--- a/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
+++ b/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  * Implementation of {@link org.olap4j.OlapDatabaseMetaData} for Mondrian.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 23, 2007
  */
 class MondrianOlap4jDatabaseMetaData implements OlapDatabaseMetaData {
diff --git a/src/mondrian/olap4j/MondrianOlap4jDimension.java b/src/mondrian/olap4j/MondrianOlap4jDimension.java
index 3157172..0e86d48 100644
--- a/src/mondrian/olap4j/MondrianOlap4jDimension.java
+++ b/src/mondrian/olap4j/MondrianOlap4jDimension.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -21,7 +21,7 @@
  * <code>MondrianOlap4jDimension</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jDimension implements Dimension, Named {
diff --git a/src/mondrian/olap4j/MondrianOlap4jDriver.java b/src/mondrian/olap4j/MondrianOlap4jDriver.java
index ddf741b..013bdbe 100644
--- a/src/mondrian/olap4j/MondrianOlap4jDriver.java
+++ b/src/mondrian/olap4j/MondrianOlap4jDriver.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -58,7 +58,7 @@
  * it to anything else.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 22, 2007
  */
 public class MondrianOlap4jDriver implements Driver {
diff --git a/src/mondrian/olap4j/MondrianOlap4jHierarchy.java b/src/mondrian/olap4j/MondrianOlap4jHierarchy.java
index 52fe24c..363f907 100644
--- a/src/mondrian/olap4j/MondrianOlap4jHierarchy.java
+++ b/src/mondrian/olap4j/MondrianOlap4jHierarchy.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * <code>MondrianOlap4jHierarchy</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 25, 2007
  */
 class MondrianOlap4jHierarchy implements Hierarchy {
diff --git a/src/mondrian/olap4j/MondrianOlap4jLevel.java b/src/mondrian/olap4j/MondrianOlap4jLevel.java
index 0b741e5..243e2fa 100644
--- a/src/mondrian/olap4j/MondrianOlap4jLevel.java
+++ b/src/mondrian/olap4j/MondrianOlap4jLevel.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * <code>MondrianOlap4jLevel</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 25, 2007
  */
 class MondrianOlap4jLevel implements Level {
diff --git a/src/mondrian/olap4j/MondrianOlap4jMember.java b/src/mondrian/olap4j/MondrianOlap4jMember.java
index 6eed81d..9b0bc62 100644
--- a/src/mondrian/olap4j/MondrianOlap4jMember.java
+++ b/src/mondrian/olap4j/MondrianOlap4jMember.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  * {@link mondrian.olap.Member}.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 25, 2007
  */
 class MondrianOlap4jMember implements Member, Named {
diff --git a/src/mondrian/olap4j/MondrianOlap4jSchema.java b/src/mondrian/olap4j/MondrianOlap4jSchema.java
index ee1fd40..8c894ad 100644
--- a/src/mondrian/olap4j/MondrianOlap4jSchema.java
+++ b/src/mondrian/olap4j/MondrianOlap4jSchema.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -26,7 +26,7 @@
  * <code>MondrianOlap4jSchema</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jSchema implements Schema, Named {
diff --git a/src/mondrian/olap4j/MondrianOlap4jStatement.java b/src/mondrian/olap4j/MondrianOlap4jStatement.java
index 9929794..f91023a 100644
--- a/src/mondrian/olap4j/MondrianOlap4jStatement.java
+++ b/src/mondrian/olap4j/MondrianOlap4jStatement.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -23,7 +23,7 @@
  * <code>MondrianOlap4jStatement</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 24, 2007
  */
 class MondrianOlap4jStatement implements OlapStatement {
diff --git a/src/mondrian/olap4j/Named.java b/src/mondrian/olap4j/Named.java
index e805dba..dee7360 100644
--- a/src/mondrian/olap4j/Named.java
+++ b/src/mondrian/olap4j/Named.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * {@link org.olap4j.metadata.NamedList} which works on such objects.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 23, 2007
  */
 interface Named {
diff --git a/src/mondrian/olap4j/NamedListImpl.java b/src/mondrian/olap4j/NamedListImpl.java
index c96e195..0f02f30 100644
--- a/src/mondrian/olap4j/NamedListImpl.java
+++ b/src/mondrian/olap4j/NamedListImpl.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * the {@link Named} interface.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 23, 2007
  */
 class NamedListImpl<T extends Named>
diff --git a/src/org/olap4j/Axis.java b/src/org/olap4j/Axis.java
index a26948c..1dfe54f 100644
--- a/src/org/olap4j/Axis.java
+++ b/src/org/olap4j/Axis.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * <p>Typically used values are ROWS, COLUMNS, and SLICER.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 23, 2006
  */
 public enum Axis {
diff --git a/src/org/olap4j/Cell.java b/src/org/olap4j/Cell.java
index cb73937..42fd22d 100755
--- a/src/org/olap4j/Cell.java
+++ b/src/org/olap4j/Cell.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Cell.java 15 2006-10-24 08:41:02Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * Cell returned from a {@link CellSet}.
  *
  * @author jhyde
- * @version $Id: Cell.java 15 2006-10-24 08:41:02Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface Cell {
diff --git a/src/org/olap4j/CellSet.java b/src/org/olap4j/CellSet.java
index 8d07c54..17daaf0 100755
--- a/src/org/olap4j/CellSet.java
+++ b/src/org/olap4j/CellSet.java
@@ -1,5 +1,5 @@
 /*
-// $Id: CellSet.java 16 2006-10-24 22:48:56Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -50,7 +50,7 @@
  * </blockquote></p>
  *
  * @author jhyde
- * @version $Id: CellSet.java 16 2006-10-24 22:48:56Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface CellSet extends ResultSet {
diff --git a/src/org/olap4j/CellSetAxis.java b/src/org/olap4j/CellSetAxis.java
index 21184e7..a7dc348 100755
--- a/src/org/olap4j/CellSetAxis.java
+++ b/src/org/olap4j/CellSetAxis.java
@@ -1,5 +1,5 @@
 /*
-// $Id: CellSetAxis.java 15 2006-10-24 08:41:02Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -16,7 +16,7 @@
  * <code>CellSetAxis</code> ...
  *
  * @author jhyde
- * @version $Id: CellSetAxis.java 15 2006-10-24 08:41:02Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface CellSetAxis {
diff --git a/src/org/olap4j/CellSetAxisMetaData.java b/src/org/olap4j/CellSetAxisMetaData.java
index 3176d45..486ccf8 100755
--- a/src/org/olap4j/CellSetAxisMetaData.java
+++ b/src/org/olap4j/CellSetAxisMetaData.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -49,7 +49,7 @@
  * </table>
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 23, 2006
  */
 public interface CellSetAxisMetaData {
diff --git a/src/org/olap4j/CellSetMetaData.java b/src/org/olap4j/CellSetMetaData.java
index a69dad1..aa65fa4 100755
--- a/src/org/olap4j/CellSetMetaData.java
+++ b/src/org/olap4j/CellSetMetaData.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * <code>CellSetMetaData</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 23, 2006
  */
 public interface CellSetMetaData extends ResultSetMetaData {
diff --git a/src/org/olap4j/OlapConnection.java b/src/org/olap4j/OlapConnection.java
index 47f8bd9..5089277 100644
--- a/src/org/olap4j/OlapConnection.java
+++ b/src/org/olap4j/OlapConnection.java
@@ -1,5 +1,5 @@
 /*
-// $Id: OlapConnection.java 16 2006-10-24 22:48:56Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -20,7 +20,7 @@
  * Connection to an OLAP server.
  *
  * @author jhyde
- * @version $Id: OlapConnection.java 16 2006-10-24 22:48:56Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface OlapConnection extends Connection {
diff --git a/src/org/olap4j/OlapDatabaseMetaData.java b/src/org/olap4j/OlapDatabaseMetaData.java
index 9c33a3f..3fd58e2 100644
--- a/src/org/olap4j/OlapDatabaseMetaData.java
+++ b/src/org/olap4j/OlapDatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -23,7 +23,7 @@
  * <p>For example, {@link #getCubes} returns the description of a cube.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 12, 2006
  */
 public interface OlapDatabaseMetaData extends DatabaseMetaData {
diff --git a/src/org/olap4j/OlapException.java b/src/org/olap4j/OlapException.java
index 9714ca5..463632b 100644
--- a/src/org/olap4j/OlapException.java
+++ b/src/org/olap4j/OlapException.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  * identify the location of the error. This information is
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 23, 2006
  */
 public class OlapException extends SQLException {
diff --git a/src/org/olap4j/OlapParameterMetaData.java b/src/org/olap4j/OlapParameterMetaData.java
index fd210b7..fcba617 100755
--- a/src/org/olap4j/OlapParameterMetaData.java
+++ b/src/org/olap4j/OlapParameterMetaData.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -29,7 +29,7 @@
  * <p>an
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 12, 2006
  */
 public interface OlapParameterMetaData extends ParameterMetaData {
diff --git a/src/org/olap4j/OlapStatement.java b/src/org/olap4j/OlapStatement.java
index b089f8b..9f9ec88 100644
--- a/src/org/olap4j/OlapStatement.java
+++ b/src/org/olap4j/OlapStatement.java
@@ -1,5 +1,5 @@
 /*
-// $Id: OlapStatement.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -20,7 +20,7 @@
  * @see PreparedOlapStatement
  *
  * @author jhyde
- * @version $Id: OlapStatement.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface OlapStatement extends Statement {
diff --git a/src/org/olap4j/Position.java b/src/org/olap4j/Position.java
index 5daeb2d..5a61766 100755
--- a/src/org/olap4j/Position.java
+++ b/src/org/olap4j/Position.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Position.java 15 2006-10-24 08:41:02Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * Position on one of the {@link CellSetAxis} objects in a {@link CellSet}.
  *
  * @author jhyde
- * @version $Id: Position.java 15 2006-10-24 08:41:02Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface Position {
diff --git a/src/org/olap4j/PreparedOlapStatement.java b/src/org/olap4j/PreparedOlapStatement.java
index 3082ce1..250284c 100644
--- a/src/org/olap4j/PreparedOlapStatement.java
+++ b/src/org/olap4j/PreparedOlapStatement.java
@@ -1,5 +1,5 @@
 /*
-// $Id: PreparedOlapStatement.java 17 2007-05-25 22:34:38Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -43,7 +43,7 @@
  * @see java.sql.ResultSet
 *
  * @author jhyde
- * @version $Id: PreparedOlapStatement.java 17 2007-05-25 22:34:38Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface PreparedOlapStatement
diff --git a/src/org/olap4j/Todo.java b/src/org/olap4j/Todo.java
index e0c0d28..ef92abc 100644
--- a/src/org/olap4j/Todo.java
+++ b/src/org/olap4j/Todo.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Todo.java 1 2006-09-02 14:08:27Z sgwood $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * Reference this class as a way of flagging todo items.
  *
  * @author jhyde
- * @version $Id: Todo.java 1 2006-09-02 14:08:27Z sgwood $
+ * @version $Id$
  * @since Aug 23, 2006
  */
 public class Todo {
diff --git a/src/org/olap4j/mdx/AxisNode.java b/src/org/olap4j/mdx/AxisNode.java
index 5e187d9..e7bb5c4 100644
--- a/src/org/olap4j/mdx/AxisNode.java
+++ b/src/org/olap4j/mdx/AxisNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * An axis in an MDX query. For example, the typical MDX query has two axes,
  * which appear as the "ON COLUMNS" and "ON ROWS" clauses.
  *
- * @version $Id: //open/mondrian/src/main/mondrian/olap/QueryAxis.java#24 $
+ * @version $Id$
  */
 public class AxisNode implements ParseTreeNode {
 
diff --git a/src/org/olap4j/mdx/CallNode.java b/src/org/olap4j/mdx/CallNode.java
index e5b19ab..0399d0c 100644
--- a/src/org/olap4j/mdx/CallNode.java
+++ b/src/org/olap4j/mdx/CallNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -32,7 +32,7 @@
  * </ul>
  *
  * @author jhyde
- * @version $Id: //open/mondrian/src/main/mondrian/olap/FunCall.java#22 $
+ * @version $Id$
  * @since Jan 6, 2006
  */
 public class CallNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/DimensionNode.java b/src/org/olap4j/mdx/DimensionNode.java
index 75148ec..989da3f 100644
--- a/src/org/olap4j/mdx/DimensionNode.java
+++ b/src/org/olap4j/mdx/DimensionNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * parse tree.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class DimensionNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/HierarchyNode.java b/src/org/olap4j/mdx/HierarchyNode.java
index 6a7c95d..bef30a8 100644
--- a/src/org/olap4j/mdx/HierarchyNode.java
+++ b/src/org/olap4j/mdx/HierarchyNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * parse tree.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class HierarchyNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/IdentifierNode.java b/src/org/olap4j/mdx/IdentifierNode.java
index e4b0371..1e567a1 100644
--- a/src/org/olap4j/mdx/IdentifierNode.java
+++ b/src/org/olap4j/mdx/IdentifierNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
 /**
  * Multi-part identifier.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 public class IdentifierNode
diff --git a/src/org/olap4j/mdx/LevelNode.java b/src/org/olap4j/mdx/LevelNode.java
index 1558b34..bb4e9e0 100644
--- a/src/org/olap4j/mdx/LevelNode.java
+++ b/src/org/olap4j/mdx/LevelNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * parse tree.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class LevelNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/LiteralNode.java b/src/org/olap4j/mdx/LiteralNode.java
index 67dd753..81c6e5e 100644
--- a/src/org/olap4j/mdx/LiteralNode.java
+++ b/src/org/olap4j/mdx/LiteralNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -20,7 +20,7 @@
  * <code>Order([Store].Members, [Measures].[Unit Sales], ASC)</code>, are
  * also represented as Literals.
  *
- * @version $Id: //open/mondrian/src/main/mondrian/olap/Literal.java#22 $
+ * @version $Id$
  * @author jhyde
  */
 public class LiteralNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/MdxUtil.java b/src/org/olap4j/mdx/MdxUtil.java
index 26c994e..b718f67 100644
--- a/src/org/olap4j/mdx/MdxUtil.java
+++ b/src/org/olap4j/mdx/MdxUtil.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * <p>NOTE: Package protected. Not part of the public olap4j API.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 6, 2007
  */
 class MdxUtil {
diff --git a/src/org/olap4j/mdx/MdxValidator.java b/src/org/olap4j/mdx/MdxValidator.java
index bc1e179..a89d3bd 100644
--- a/src/org/olap4j/mdx/MdxValidator.java
+++ b/src/org/olap4j/mdx/MdxValidator.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  * <p>NOTE: This class is experimental. Not part of the public olap4j API.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 class MdxValidator implements ParseTreeVisitor<ParseTreeNode> {
diff --git a/src/org/olap4j/mdx/MemberNode.java b/src/org/olap4j/mdx/MemberNode.java
index c1f8d60..8581356 100644
--- a/src/org/olap4j/mdx/MemberNode.java
+++ b/src/org/olap4j/mdx/MemberNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * parse tree.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class MemberNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/ParameterNode.java b/src/org/olap4j/mdx/ParameterNode.java
index 0ed7005..4148c7d 100644
--- a/src/org/olap4j/mdx/ParameterNode.java
+++ b/src/org/olap4j/mdx/ParameterNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -26,7 +26,7 @@
  * <code>ParamRef(name)</code> creates a reference to a parameter defined
  * elsewhere in the query.
  *
- * @version $Id: //open/mondrian/src/main/mondrian/olap/QueryAxis.java#24 $
+ * @version $Id$
  */
 public class ParameterNode implements ParseTreeNode {
     private String name;
diff --git a/src/org/olap4j/mdx/ParseTreeNode.java b/src/org/olap4j/mdx/ParseTreeNode.java
index 49723de..9e65f3f 100644
--- a/src/org/olap4j/mdx/ParseTreeNode.java
+++ b/src/org/olap4j/mdx/ParseTreeNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -29,7 +29,7 @@
  * </blockquote>
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public interface ParseTreeNode {
diff --git a/src/org/olap4j/mdx/ParseTreeVisitor.java b/src/org/olap4j/mdx/ParseTreeVisitor.java
index 2235e66..bdebad1 100644
--- a/src/org/olap4j/mdx/ParseTreeVisitor.java
+++ b/src/org/olap4j/mdx/ParseTreeVisitor.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * Interface for a visitor to an MDX parse tree.
  *
  * @author jhyde
- * @version $Id: //open/mondrian/src/main/mondrian/mdx/ParseTreeVisitor.java#1 $
+ * @version $Id$
  * @since Jul 21, 2006
  */
 public interface ParseTreeVisitor<T> {
diff --git a/src/org/olap4j/mdx/ParseTreeWriter.java b/src/org/olap4j/mdx/ParseTreeWriter.java
index 36af8c3..b982a55 100644
--- a/src/org/olap4j/mdx/ParseTreeWriter.java
+++ b/src/org/olap4j/mdx/ParseTreeWriter.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * <code>ParseTreeWriter</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class ParseTreeWriter {
diff --git a/src/org/olap4j/mdx/PropertyValueNode.java b/src/org/olap4j/mdx/PropertyValueNode.java
index 1d2cd58..6efbc63 100644
--- a/src/org/olap4j/mdx/PropertyValueNode.java
+++ b/src/org/olap4j/mdx/PropertyValueNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -21,7 +21,7 @@
  * SELECT ...</code>
  * there are two property-value pairs FORMAT_STRING and SOLVE_ORDER.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 public class PropertyValueNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/SelectNode.java b/src/org/olap4j/mdx/SelectNode.java
index beac96a..8a26e40 100644
--- a/src/org/olap4j/mdx/SelectNode.java
+++ b/src/org/olap4j/mdx/SelectNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  * Parse tree model for an MDX SELECT statement.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 4, 2007
  */
 public class SelectNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/Syntax.java b/src/org/olap4j/mdx/Syntax.java
index 264fc50..1371882 100644
--- a/src/org/olap4j/mdx/Syntax.java
+++ b/src/org/olap4j/mdx/Syntax.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  *
  * @author jhyde
  * @since 21 July, 2003
- * @version $Id: //open/mondrian/src/main/mondrian/olap/Syntax.java#15 $
+ * @version $Id$
  */
 public enum Syntax {
     /**
diff --git a/src/org/olap4j/mdx/WithMemberNode.java b/src/org/olap4j/mdx/WithMemberNode.java
index 33f6ad3..b04c46e 100644
--- a/src/org/olap4j/mdx/WithMemberNode.java
+++ b/src/org/olap4j/mdx/WithMemberNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * Parse tree node which declares a calculated member. Represented as the
  * <code>WITH MEMBER</code> clause of an MDX <code>SELECT</code> statement.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 public class WithMemberNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/WithSetNode.java b/src/org/olap4j/mdx/WithSetNode.java
index b55ebb7..109c1b3 100644
--- a/src/org/olap4j/mdx/WithSetNode.java
+++ b/src/org/olap4j/mdx/WithSetNode.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * Parse tree node which declares a calculated member. Represented as the
  * <code>WITH SET</code> clause of an MDX <code>SELECT</code> statement.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 public class WithSetNode implements ParseTreeNode {
diff --git a/src/org/olap4j/mdx/parser/MdxParser.java b/src/org/olap4j/mdx/parser/MdxParser.java
index 04c7190..8d4bebc 100644
--- a/src/org/olap4j/mdx/parser/MdxParser.java
+++ b/src/org/olap4j/mdx/parser/MdxParser.java
@@ -1,5 +1,5 @@
 /*
-// $Id: MdxParser.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -23,7 +23,7 @@
  * @see org.olap4j.mdx.parser.impl.DefaultMdxParserImpl
  *
  * @author jhyde
- * @version $Id: MdxParser.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface MdxParser {
diff --git a/src/org/olap4j/mdx/parser/MdxParserFactory.java b/src/org/olap4j/mdx/parser/MdxParserFactory.java
index aee922d..74a644a 100644
--- a/src/org/olap4j/mdx/parser/MdxParserFactory.java
+++ b/src/org/olap4j/mdx/parser/MdxParserFactory.java
@@ -1,5 +1,5 @@
 /*
-// $Id: MdxParserFactory.java 1 2006-09-02 14:08:27Z sgwood $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * Factory for MDX parsers.
  *
  * @author jhyde
- * @version $Id: MdxParserFactory.java 1 2006-09-02 14:08:27Z sgwood $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface MdxParserFactory {
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
index 8f43a63..940fb32 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/mondrian/olap/Parser.cup#34 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -23,7 +23,7 @@ import org.olap4j.mdx.*;
 // Preliminaries to set up and use the scanner.
 // action code {: ... :};
 parser code {:
-    // Generated from $Id: //open/mondrian/src/main/mondrian/olap/Parser.cup#34 $
+    // Generated from $Id$
     private Scanner scanner;
     private String queryString;
     private OlapConnection mdxConnection;
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
index d6b35c9..df3597f 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
@@ -1,5 +1,5 @@
 /*
-// $Id: DefaultMdxParserImpl.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * Default implementation of {@link org.olap4j.mdx.parser.MdxParser MDX Parser}.
  *
  * @author jhyde
- * @version $Id: DefaultMdxParserImpl.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public class DefaultMdxParserImpl implements MdxParser {
diff --git a/src/org/olap4j/mdx/parser/impl/Scanner.java b/src/org/olap4j/mdx/parser/impl/Scanner.java
index 22a4abd..ad92075 100644
--- a/src/org/olap4j/mdx/parser/impl/Scanner.java
+++ b/src/org/olap4j/mdx/parser/impl/Scanner.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  *
  * <p>NOTE: This class is not part of the public olap4j API.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 class Scanner {
diff --git a/src/org/olap4j/mdx/parser/impl/StringScanner.java b/src/org/olap4j/mdx/parser/impl/StringScanner.java
index a55dd28..29a616c 100644
--- a/src/org/olap4j/mdx/parser/impl/StringScanner.java
+++ b/src/org/olap4j/mdx/parser/impl/StringScanner.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -14,7 +14,7 @@
  *
  * <p>NOTE: This class is not part of the public olap4j API.
  *
- * @version $Id: $
+ * @version $Id$
  * @author jhyde
  */
 class StringScanner extends Scanner {
diff --git a/src/org/olap4j/metadata/Catalog.java b/src/org/olap4j/metadata/Catalog.java
index 7053527..4c6b097 100644
--- a/src/org/olap4j/metadata/Catalog.java
+++ b/src/org/olap4j/metadata/Catalog.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -40,7 +40,7 @@
  * </blockquote>
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 24, 2006
  */
 public interface Catalog {
diff --git a/src/org/olap4j/metadata/Cube.java b/src/org/olap4j/metadata/Cube.java
index ce5fd2e..5259580 100644
--- a/src/org/olap4j/metadata/Cube.java
+++ b/src/org/olap4j/metadata/Cube.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Cube.java 16 2006-10-24 22:48:56Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * <code>Cube</code> ...
  *
  * @author jhyde
- * @version $Id: Cube.java 16 2006-10-24 22:48:56Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface Cube extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Dimension.java b/src/org/olap4j/metadata/Dimension.java
index b7a8b59..4c76dff 100644
--- a/src/org/olap4j/metadata/Dimension.java
+++ b/src/org/olap4j/metadata/Dimension.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Dimension.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * <code>Dimension</code> ...
  *
  * @author jhyde
- * @version $Id: Dimension.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface Dimension extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Hierarchy.java b/src/org/olap4j/metadata/Hierarchy.java
index 3ad2d0d..5054586 100644
--- a/src/org/olap4j/metadata/Hierarchy.java
+++ b/src/org/olap4j/metadata/Hierarchy.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Hierarchy.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * <code>Hierarchy</code> ...
  *
  * @author jhyde
- * @version $Id: Hierarchy.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 23, 2006
  */
 public interface Hierarchy extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Level.java b/src/org/olap4j/metadata/Level.java
index 01ca2ab..eec8b68 100644
--- a/src/org/olap4j/metadata/Level.java
+++ b/src/org/olap4j/metadata/Level.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Level.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -16,7 +16,7 @@
  * all with the same attributes and at the same depth in the hierarchy.
  *
  * @author jhyde
- * @version $Id: Level.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 23, 2006
  */
 public interface Level extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Measure.java b/src/org/olap4j/metadata/Measure.java
index 6f5d8b4..73eec5b 100644
--- a/src/org/olap4j/metadata/Measure.java
+++ b/src/org/olap4j/metadata/Measure.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * <code>Measure</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 13, 2006
  */
 public interface Measure extends Member {
diff --git a/src/org/olap4j/metadata/Member.java b/src/org/olap4j/metadata/Member.java
index 63e089f..429262c 100644
--- a/src/org/olap4j/metadata/Member.java
+++ b/src/org/olap4j/metadata/Member.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Member.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * <code>Member</code> is a data value in an OLAP Dimension.
  *
  * @author jhyde
- * @version $Id: Member.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface Member extends MetadataElement {
diff --git a/src/org/olap4j/metadata/MetadataElement.java b/src/org/olap4j/metadata/MetadataElement.java
index 5011a70..2f9523e 100644
--- a/src/org/olap4j/metadata/MetadataElement.java
+++ b/src/org/olap4j/metadata/MetadataElement.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * Common interface for
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 13, 2006
  */
 public interface MetadataElement {
diff --git a/src/org/olap4j/metadata/NamedList.java b/src/org/olap4j/metadata/NamedList.java
index 445a174..b66715c 100644
--- a/src/org/olap4j/metadata/NamedList.java
+++ b/src/org/olap4j/metadata/NamedList.java
@@ -1,5 +1,5 @@
 /*
-// $Id: NamedList.java 17 2007-05-25 22:34:38Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -16,7 +16,7 @@
  * list by name as well as by ordinal.
  *
  * @author jhyde
- * @version $Id: NamedList.java 17 2007-05-25 22:34:38Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public interface NamedList<E> extends List<E> {
diff --git a/src/org/olap4j/metadata/NamedSet.java b/src/org/olap4j/metadata/NamedSet.java
index c5b3f83..5f21298 100644
--- a/src/org/olap4j/metadata/NamedSet.java
+++ b/src/org/olap4j/metadata/NamedSet.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * Metadata object describing a named set defined against a {@link Cube}.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 24, 2006
  */
 public interface NamedSet extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Property.java b/src/org/olap4j/metadata/Property.java
index 715201e..d4f7ccb 100644
--- a/src/org/olap4j/metadata/Property.java
+++ b/src/org/olap4j/metadata/Property.java
@@ -1,5 +1,5 @@
 /*
-// $Id: Property.java 18 2007-06-10 18:31:17Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -16,7 +16,7 @@
  * {@link org.olap4j.Cell}.
  *
  * @author jhyde
- * @version $Id: Property.java 18 2007-06-10 18:31:17Z jhyde $
+ * @version $Id$
  * @since Aug 23, 2006
  */
 public interface Property extends MetadataElement {
diff --git a/src/org/olap4j/metadata/Schema.java b/src/org/olap4j/metadata/Schema.java
index d3ed588..ea9b5a4 100644
--- a/src/org/olap4j/metadata/Schema.java
+++ b/src/org/olap4j/metadata/Schema.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -18,7 +18,7 @@
  * <code>Schema</code> ...
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 13, 2006
  */
 public interface Schema {
diff --git a/src/org/olap4j/query/Query.java b/src/org/olap4j/query/Query.java
index a01c8e2..d64726e 100644
--- a/src/org/olap4j/query/Query.java
+++ b/src/org/olap4j/query/Query.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  * Query model.
  *
  * @author jhyde, jdixon
- * @version $Id: $
+ * @version $Id$
  * @since May 29, 2007
  */
 public class Query {
diff --git a/src/org/olap4j/query/QueryAxis.java b/src/org/olap4j/query/QueryAxis.java
index c8c851f..8b8c056 100644
--- a/src/org/olap4j/query/QueryAxis.java
+++ b/src/org/olap4j/query/QueryAxis.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -21,7 +21,7 @@
  * dimensions that are placed on it.
  *
  * @author jdixon
- * @version $Id: $
+ * @version $Id$
  * @since May 29, 2007
  */
 public class QueryAxis {
diff --git a/src/org/olap4j/query/QueryDimension.java b/src/org/olap4j/query/QueryDimension.java
index 2fe3912..e78a8b1 100644
--- a/src/org/olap4j/query/QueryDimension.java
+++ b/src/org/olap4j/query/QueryDimension.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -28,7 +28,7 @@
  * must still remember to test all of the ways selections can be added/removed.
  *
  * @author jdixon, jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 29, 2007
  */
 public class QueryDimension {
diff --git a/src/org/olap4j/query/Selection.java b/src/org/olap4j/query/Selection.java
index bb94d0b..fe97fb7 100644
--- a/src/org/olap4j/query/Selection.java
+++ b/src/org/olap4j/query/Selection.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -24,7 +24,7 @@
  * exist.
  *
  * @author jdixon, jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 30, 2007
  */
 public interface Selection {
diff --git a/src/org/olap4j/query/SelectionFactory.java b/src/org/olap4j/query/SelectionFactory.java
index 7e2c7e6..94ce67e 100644
--- a/src/org/olap4j/query/SelectionFactory.java
+++ b/src/org/olap4j/query/SelectionFactory.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  * <p>Created using {@link Query#getSelectionFactory()}.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 30, 2007
  */
 public class SelectionFactory {
diff --git a/src/org/olap4j/query/SelectionImpl.java b/src/org/olap4j/query/SelectionImpl.java
index 0de8730..55ba7fc 100644
--- a/src/org/olap4j/query/SelectionImpl.java
+++ b/src/org/olap4j/query/SelectionImpl.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  * Abstract implementation of {@link Selection}.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since May 30, 2007
  */
 abstract class SelectionImpl implements Selection {
diff --git a/src/org/olap4j/sample/SimpleQuerySample.java b/src/org/olap4j/sample/SimpleQuerySample.java
index 04d42ad..482bed2 100644
--- a/src/org/olap4j/sample/SimpleQuerySample.java
+++ b/src/org/olap4j/sample/SimpleQuerySample.java
@@ -1,5 +1,5 @@
 /*
-// $Id: SimpleQuerySample.java 10 2006-10-16 05:37:08Z jhyde $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -25,7 +25,7 @@
  * Collection of olap4j samples illustrating connections and statements.
  *
  * @author jhyde
- * @version $Id: SimpleQuerySample.java 10 2006-10-16 05:37:08Z jhyde $
+ * @version $Id$
  * @since Aug 22, 2006
  */
 public class SimpleQuerySample {
diff --git a/src/org/olap4j/sample/SpringSample.java b/src/org/olap4j/sample/SpringSample.java
index 80c2b10..dbf9b3d 100644
--- a/src/org/olap4j/sample/SpringSample.java
+++ b/src/org/olap4j/sample/SpringSample.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -20,7 +20,7 @@
  * Example of olap4j code running inside Spring framework.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Oct 11, 2006
  */
 public class SpringSample {
diff --git a/src/org/olap4j/type/BooleanType.java b/src/org/olap4j/type/BooleanType.java
index ba32698..1d05178 100755
--- a/src/org/olap4j/type/BooleanType.java
+++ b/src/org/olap4j/type/BooleanType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/BooleanType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -14,7 +14,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/BooleanType.java#3 $
+ * @version $Id$
  */
 public class BooleanType extends ScalarType {
     public String toString() {
diff --git a/src/org/olap4j/type/CubeType.java b/src/org/olap4j/type/CubeType.java
index 6dec509..e2c6cc3 100755
--- a/src/org/olap4j/type/CubeType.java
+++ b/src/org/olap4j/type/CubeType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/CubeType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/CubeType.java#3 $
+ * @version $Id$
  */
 public class CubeType implements Type {
     private final Cube cube;
diff --git a/src/org/olap4j/type/DecimalType.java b/src/org/olap4j/type/DecimalType.java
index 267f967..c5ddeb7 100755
--- a/src/org/olap4j/type/DecimalType.java
+++ b/src/org/olap4j/type/DecimalType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/DecimalType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -15,7 +15,7 @@
  *
  * @author jhyde
  * @since May 3, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/DecimalType.java#3 $
+ * @version $Id$
  */
 public class DecimalType extends NumericType {
     private final int precision;
diff --git a/src/org/olap4j/type/DimensionType.java b/src/org/olap4j/type/DimensionType.java
index 4b581e0..1a961bb 100755
--- a/src/org/olap4j/type/DimensionType.java
+++ b/src/org/olap4j/type/DimensionType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/DimensionType.java#5 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/DimensionType.java#5 $
+ * @version $Id$
  */
 public class DimensionType implements Type {
     private final Dimension dimension;
diff --git a/src/org/olap4j/type/HierarchyType.java b/src/org/olap4j/type/HierarchyType.java
index 7ecaa95..7ec5fea 100755
--- a/src/org/olap4j/type/HierarchyType.java
+++ b/src/org/olap4j/type/HierarchyType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/HierarchyType.java#5 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/HierarchyType.java#5 $
+ * @version $Id$
  */
 public class HierarchyType implements Type {
     private final Dimension dimension;
diff --git a/src/org/olap4j/type/LevelType.java b/src/org/olap4j/type/LevelType.java
index 26a9a38..fbf51eb 100755
--- a/src/org/olap4j/type/LevelType.java
+++ b/src/org/olap4j/type/LevelType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/LevelType.java#5 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/LevelType.java#5 $
+ * @version $Id$
  */
 public class LevelType implements Type {
     private final Dimension dimension;
diff --git a/src/org/olap4j/type/MemberType.java b/src/org/olap4j/type/MemberType.java
index 12d6c17..e0eb934 100644
--- a/src/org/olap4j/type/MemberType.java
+++ b/src/org/olap4j/type/MemberType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/MemberType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -20,7 +20,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/MemberType.java#3 $
+ * @version $Id$
  */
 public class MemberType implements Type {
     private final Hierarchy hierarchy;
diff --git a/src/org/olap4j/type/NullType.java b/src/org/olap4j/type/NullType.java
index d53d88b..28eb68b 100755
--- a/src/org/olap4j/type/NullType.java
+++ b/src/org/olap4j/type/NullType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/NullType.java#1 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -13,7 +13,7 @@
  * The type of a null expression.
  *
  * @author medstat
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/NullType.java#1 $
+ * @version $Id$
  * @since Aug 21, 2006
  */
 public class NullType extends ScalarType
diff --git a/src/org/olap4j/type/NumericType.java b/src/org/olap4j/type/NumericType.java
index 899f554..b792d93 100755
--- a/src/org/olap4j/type/NumericType.java
+++ b/src/org/olap4j/type/NumericType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/NumericType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/NumericType.java#3 $
+ * @version $Id$
  */
 public class NumericType extends ScalarType {
 
diff --git a/src/org/olap4j/type/ScalarType.java b/src/org/olap4j/type/ScalarType.java
index 8b8195b..16db006 100755
--- a/src/org/olap4j/type/ScalarType.java
+++ b/src/org/olap4j/type/ScalarType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/ScalarType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/ScalarType.java#3 $
+ * @version $Id$
  */
 public class ScalarType implements Type {
     public boolean usesDimension(Dimension dimension, boolean maybe) {
diff --git a/src/org/olap4j/type/SetType.java b/src/org/olap4j/type/SetType.java
index 28949f1..7e80733 100755
--- a/src/org/olap4j/type/SetType.java
+++ b/src/org/olap4j/type/SetType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/SetType.java#4 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/SetType.java#4 $
+ * @version $Id$
  */
 public class SetType implements Type {
 
diff --git a/src/org/olap4j/type/StringType.java b/src/org/olap4j/type/StringType.java
index fe3e76f..a77ea66 100755
--- a/src/org/olap4j/type/StringType.java
+++ b/src/org/olap4j/type/StringType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/StringType.java#2 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/StringType.java#2 $
+ * @version $Id$
  */
 public class StringType extends ScalarType {
 
diff --git a/src/org/olap4j/type/SymbolType.java b/src/org/olap4j/type/SymbolType.java
index 948a75c..7dc0e59 100755
--- a/src/org/olap4j/type/SymbolType.java
+++ b/src/org/olap4j/type/SymbolType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/SymbolType.java#2 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -14,7 +14,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/SymbolType.java#2 $
+ * @version $Id$
  */
 public class SymbolType extends ScalarType {
 
diff --git a/src/org/olap4j/type/TupleType.java b/src/org/olap4j/type/TupleType.java
index 9e28100..11b3948 100755
--- a/src/org/olap4j/type/TupleType.java
+++ b/src/org/olap4j/type/TupleType.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/TupleType.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/TupleType.java#3 $
+ * @version $Id$
  */
 public class TupleType implements Type {
     public final Type[] elementTypes;
diff --git a/src/org/olap4j/type/Type.java b/src/org/olap4j/type/Type.java
index 257ef84..7a66d5e 100644
--- a/src/org/olap4j/type/Type.java
+++ b/src/org/olap4j/type/Type.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/Type.java#3 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -19,7 +19,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/Type.java#3 $
+ * @version $Id$
  */
 public interface Type {
     /**
diff --git a/src/org/olap4j/type/TypeUtil.java b/src/org/olap4j/type/TypeUtil.java
index dceec32..ed52f9d 100755
--- a/src/org/olap4j/type/TypeUtil.java
+++ b/src/org/olap4j/type/TypeUtil.java
@@ -1,5 +1,5 @@
 /*
-// $Id: //open/mondrian/src/main/org.olap4j.type/TypeUtil.java#5 $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -17,7 +17,7 @@
  *
  * @author jhyde
  * @since Feb 17, 2005
- * @version $Id: //open/mondrian/src/main/org.olap4j.type/TypeUtil.java#5 $
+ * @version $Id$
  */
 public class TypeUtil {
 
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index ca732b1..1660c3e 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -33,7 +33,7 @@
 /**
  * Unit test for olap4j Driver and Connection classes.
  *
- * @version $Id: $
+ * @version $Id$
  */
 public class ConnectionTest extends TestCase {
     private final Helper helper = new HelperImpl();
diff --git a/testsrc/org/olap4j/OlapTest.java b/testsrc/org/olap4j/OlapTest.java
index 9b52856..220b4cd 100644
--- a/testsrc/org/olap4j/OlapTest.java
+++ b/testsrc/org/olap4j/OlapTest.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -31,7 +31,7 @@
  *
  * @since  May 22, 2007
  * @author James Dixon
- * @version $Id: $
+ * @version $Id$
  */
 public class OlapTest {
 
diff --git a/testsrc/org/olap4j/test/ParserTest.java b/testsrc/org/olap4j/test/ParserTest.java
index 86d3414..6dda50f 100644
--- a/testsrc/org/olap4j/test/ParserTest.java
+++ b/testsrc/org/olap4j/test/ParserTest.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -22,7 +22,7 @@
  * Tests the MDX parser.
  *
  * @author gjohnson, jhyde
- * @version $Id: //open/mondrian/testsrc/main/mondrian/olap/ParserTest.java#28 $
+ * @version $Id$
  */
 public class ParserTest extends TestCase {
     public ParserTest(String name) {
diff --git a/testsrc/org/olap4j/test/TestContext.java b/testsrc/org/olap4j/test/TestContext.java
index 6e902ee..b5cb0bd 100644
--- a/testsrc/org/olap4j/test/TestContext.java
+++ b/testsrc/org/olap4j/test/TestContext.java
@@ -1,5 +1,5 @@
 /*
-// $Id: $
+// $Id$
 // This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
 // http://www.opensource.org/licenses/cpl.html.
@@ -31,7 +31,7 @@
  * <p>Also provides static utility methods such as {@link #fold(String)}.
  *
  * @author jhyde
- * @version $Id: $
+ * @version $Id$
  * @since Jun 7, 2007
 */
 public class TestContext {