adding zookeeper strata files

author: mike smith <mike.smith@codethink.co.uk> 2014-11-04 16:41:42 +0000
committer: mike smith <mike.smith@codethink.co.uk> 2014-11-04 16:41:42 +0000
commit: d0afa34549e85e42cbd4ac28d09e812bf6bcebc6 (patch)
tree: 01ca2964f10d3da41400f44a5ef1b2af9a658618
parent: f831b6cce0952e3c1a781f436401c86079a73434 (diff)
download: definitions-d0afa34549e85e42cbd4ac28d09e812bf6bcebc6.tar.gz
68 files changed, 20 insertions, 2532 deletions
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
index ec72b3b9..6c73a4e4 100644
--- a/strata/zookeeper.morph
+++ b/strata/zookeeper.morph
@@ -1,12 +1,12 @@
 name: zookeeper
 kind: stratum
 description: a first pass attempt at creating a zookeeper stratum for baserock.
-build-depends: 
-  - morph: strata/core.morph
-chunks: 
+build-depends:
+- morph: strata/core.morph
+chunks:
 - name: cppunit
   repo: upstream:cppunit
-  ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf 
+  ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf
   build-depends: []
 - name: java-binary
   morph: strata/zookeeper/java-binary.morph
@@ -19,12 +19,12 @@ chunks:
   repo: upstream:java/ant
   ref: master
   build-depends:
-    - cppunit
-    - java-binary
+  - cppunit
+  - java-binary
 - name: zookeeper
   morph: strata/zookeeper/zookeeper.morph
   repo: upstream:zookeeper
-  ref: branch-3.5
+  ref: baserock/mikesmith/zookeeper
+  unpetrify-ref: trunk
   build-depends:
-    - java/ant
-
+  - java/ant
diff --git a/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive$BinaryIndex.class b/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive$BinaryIndex.class
deleted file mode 100644
index 74f063c6..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive$BinaryIndex.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive.class
deleted file mode 100644
index faad8689..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/BinaryInputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/BinaryOutputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/BinaryOutputArchive.class
deleted file mode 100644
index 0f3e78b2..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/BinaryOutputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$1.class b/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$1.class
deleted file mode 100644
index 6f4bcb67..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$1.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$CsvIndex.class b/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$CsvIndex.class
deleted file mode 100644
index 92da725a..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive$CsvIndex.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive.class
deleted file mode 100644
index f2d4fc43..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/CsvInputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/CsvOutputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/CsvOutputArchive.class
deleted file mode 100644
index f0c73e34..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/CsvOutputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/Index.class b/strata/zookeeper/build/classes/org/apache/jute/Index.class
deleted file mode 100644
index 410f05d3..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/Index.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/InputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/InputArchive.class
deleted file mode 100644
index 26639388..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/InputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/OutputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/OutputArchive.class
deleted file mode 100644
index 0c7e41ab..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/OutputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/Record.class b/strata/zookeeper/build/classes/org/apache/jute/Record.class
deleted file mode 100644
index 21dfb74b..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/Record.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/RecordReader.class b/strata/zookeeper/build/classes/org/apache/jute/RecordReader.class
deleted file mode 100644
index 7266d091..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/RecordReader.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/RecordWriter.class b/strata/zookeeper/build/classes/org/apache/jute/RecordWriter.class
deleted file mode 100644
index b8f8abeb..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/RecordWriter.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/Utils.class b/strata/zookeeper/build/classes/org/apache/jute/Utils.class
deleted file mode 100644
index 16bb447c..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/Utils.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$1.class b/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$1.class
deleted file mode 100644
index 70ee05f6..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$1.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$Value.class b/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$Value.class
deleted file mode 100644
index abfc71fc..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$Value.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XMLParser.class b/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XMLParser.class
deleted file mode 100644
index 73675652..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XMLParser.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XmlIndex.class b/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XmlIndex.class
deleted file mode 100644
index 095260d1..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive$XmlIndex.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive.class
deleted file mode 100644
index fee7d242..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlInputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/XmlOutputArchive.class b/strata/zookeeper/build/classes/org/apache/jute/XmlOutputArchive.class
deleted file mode 100644
index b93cd483..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/XmlOutputArchive.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/CGenerator.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/CGenerator.class
deleted file mode 100644
index ec84a59a..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/CGenerator.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/CSharpGenerator.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/CSharpGenerator.class
deleted file mode 100644
index 2a19ab99..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/CSharpGenerator.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/CppGenerator.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/CppGenerator.class
deleted file mode 100644
index f337a79f..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/CppGenerator.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JBoolean.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JBoolean.class
deleted file mode 100644
index 832f2cfa..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JBoolean.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JBuffer.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JBuffer.class
deleted file mode 100644
index c7e85c61..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JBuffer.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JByte.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JByte.class
deleted file mode 100644
index e30859a1..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JByte.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JCompType.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JCompType.class
deleted file mode 100644
index e819ed0f..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JCompType.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JDouble.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JDouble.class
deleted file mode 100644
index 01d06a93..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JDouble.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JField.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JField.class
deleted file mode 100644
index ccaae543..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JField.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JFile.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JFile.class
deleted file mode 100644
index 93c7daec..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JFile.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JFloat.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JFloat.class
deleted file mode 100644
index dc11a32e..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JFloat.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JInt.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JInt.class
deleted file mode 100644
index f1507e33..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JInt.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JLong.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JLong.class
deleted file mode 100644
index 6330d5f4..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JLong.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JMap.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JMap.class
deleted file mode 100644
index 0048be78..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JMap.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JRecord.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JRecord.class
deleted file mode 100644
index 828fe9c1..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JRecord.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JString.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JString.class
deleted file mode 100644
index f75222f9..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JString.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JType.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JType.class
deleted file mode 100644
index 983c2099..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JType.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JVector.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JVector.class
deleted file mode 100644
index e3286446..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JVector.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/JavaGenerator.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/JavaGenerator.class
deleted file mode 100644
index 12c19e54..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/JavaGenerator.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/ParseException.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/ParseException.class
deleted file mode 100644
index baedf746..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/ParseException.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Rcc.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Rcc.class
deleted file mode 100644
index 4ea37484..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Rcc.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccConstants.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccConstants.class
deleted file mode 100644
index d886e869..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccConstants.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccTokenManager.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccTokenManager.class
deleted file mode 100644
index 4f4d4942..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/RccTokenManager.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/SimpleCharStream.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/SimpleCharStream.class
deleted file mode 100644
index c2e60352..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/SimpleCharStream.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Token.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Token.class
deleted file mode 100644
index c42e0a39..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/Token.class
+++ /dev/null
diff --git a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/TokenMgrError.class b/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/TokenMgrError.class
deleted file mode 100644
index 231f5bb6..00000000
--- a/strata/zookeeper/build/classes/org/apache/jute/compiler/generated/TokenMgrError.class
+++ /dev/null
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/ParseException.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/ParseException.java
deleted file mode 100644
index f1b1da3f..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/ParseException.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
-/* JavaCCOptions:KEEP_LINE_COL=null */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-/**
- * This exception is thrown when parse errors are encountered.
- * You can explicitly create objects of this exception type by
- * calling the method generateParseException in the generated
- * parser.
- *
- * You can modify this class to customize your error reporting
- * mechanisms so long as you retain the public fields.
- */
-public class ParseException extends Exception {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
-
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
-
-  public ParseException() {
-    super();
-  }
-
-  /** Constructor with message. */
-  public ParseException(String message) {
-    super(message);
-  }
-
-
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
-
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
-
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
-
-  /**
-   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser) the correct error message
-   * gets displayed.
-   */
-  private static String initialise(Token currentToken,
-                           int[][] expectedTokenSequences,
-                           String[] tokenImage) {
-    String eol = System.getProperty("line.separator", "\n");
-    StringBuffer expected = new StringBuffer();
-    int maxSize = 0;
-    for (int i = 0; i < expectedTokenSequences.length; i++) {
-      if (maxSize < expectedTokenSequences[i].length) {
-        maxSize = expectedTokenSequences[i].length;
-      }
-      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
-      }
-      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append("...");
-      }
-      expected.append(eol).append("    ");
-    }
-    String retval = "Encountered \"";
-    Token tok = currentToken.next;
-    for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += " " + tokenImage[tok.kind];
-      retval += " \"";
-      retval += add_escapes(tok.image);
-      retval += " \"";
-      tok = tok.next;
-    }
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + eol;
-    if (expectedTokenSequences.length == 1) {
-      retval += "Was expecting:" + eol + "    ";
-    } else {
-      retval += "Was expecting one of:" + eol + "    ";
-    }
-    retval += expected.toString();
-    return retval;
-  }
-
-  /**
-   * The end of line string for this machine.
-   */
-  protected String eol = System.getProperty("line.separator", "\n");
-
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  static String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
-      }
-      return retval.toString();
-   }
-
-}
-/* JavaCC - OriginalChecksum=f5d120a3a5c2aa75675f52365f7c2d17 (do not edit this line) */
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Rcc.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Rcc.java
deleted file mode 100644
index 4889cd85..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Rcc.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. Rcc.java */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-import org.apache.jute.compiler.*;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-@SuppressWarnings("unused")
-public class Rcc implements RccConstants {
-    private static Hashtable<String, JRecord> recTab = new Hashtable<String, JRecord>();
-    private static String curDir = System.getProperty("user.dir");
-    private static String curFileName;
-    private static String curModuleName;
-
-    public static void main(String args[]) {
-        String language = "java";
-        ArrayList<String> recFiles = new ArrayList<String>();
-        JFile curFile=null;
-
-        for (int i=0; i<args.length; i++) {
-            if ("-l".equalsIgnoreCase(args[i]) ||
-                "--language".equalsIgnoreCase(args[i])) {
-                language = args[i+1].toLowerCase();
-                i++;
-            } else {
-                recFiles.add(args[i]);
-            }
-        }
-        if (!"c++".equals(language) && !"java".equals(language) && !"c".equals(language)) {
-            System.out.println("Cannot recognize language:" + language);
-            System.exit(1);
-        }
-        if (recFiles.size() == 0) {
-            System.out.println("No record files specified. Exiting.");
-            System.exit(1);
-        }
-        for (int i=0; i<recFiles.size(); i++) {
-            curFileName = recFiles.get(i);
-            File file = new File(curFileName);
-            try {
-                curFile = parseFile(file);
-            } catch (FileNotFoundException e) {
-                System.out.println("File " + recFiles.get(i) + " Not found.");
-                System.exit(1);
-            } catch (ParseException e) {
-                System.out.println(e.toString());
-                System.exit(1);
-            }
-            System.out.println(recFiles.get(i) + " Parsed Successfully");
-            try {
-                curFile.genCode(language, new File("."));
-            } catch (IOException e) {
-                System.out.println(e.toString());
-                System.exit(1);
-            }
-        }
-    }
-
-    public static JFile parseFile(File file) throws FileNotFoundException, ParseException {
-        curDir = file.getParent();
-        curFileName = file.getName();
-        FileReader reader = new FileReader(file);
-        try {
-            Rcc parser = new Rcc(reader);
-            recTab = new Hashtable<String, JRecord>();
-            return parser.Input();
-        } finally {
-            try {
-                reader.close();
-            } catch (IOException e) {
-            }
-        }
-    }
-
-  final public JFile Input() throws ParseException {
-    ArrayList<JFile> ilist = new ArrayList<JFile>();
-    ArrayList<JRecord> rlist = new ArrayList<JRecord>();
-    JFile i;
-    ArrayList <JRecord>l;
-    label_1:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case INCLUDE_TKN:
-        i = Include();
-          ilist.add(i);
-        break;
-      case MODULE_TKN:
-        l = Module();
-          rlist.addAll(l);
-        break;
-      default:
-        jj_la1[0] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case MODULE_TKN:
-      case INCLUDE_TKN:
-        ;
-        break;
-      default:
-        jj_la1[1] = jj_gen;
-        break label_1;
-      }
-    }
-    jj_consume_token(0);
-      {if (true) return new JFile(curFileName, ilist, rlist);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JFile Include() throws ParseException {
-    String fname;
-    Token t;
-    jj_consume_token(INCLUDE_TKN);
-    t = jj_consume_token(CSTRING_TKN);
-        JFile ret = null;
-        fname = t.image.replaceAll("^\u005c"", "").replaceAll("\u005c"$","");
-        File file = new File(curDir, fname);
-        String tmpDir = curDir;
-        String tmpFile = curFileName;
-        curDir = file.getParent();
-        curFileName = file.getName();
-        try {
-            FileReader reader = new FileReader(file);
-            Rcc parser = new Rcc(reader);
-            try {
-                ret = parser.Input();
-                System.out.println(fname + " Parsed Successfully");
-            } catch (ParseException e) {
-                System.out.println(e.toString());
-                System.exit(1);
-            }
-            try {
-                reader.close();
-            } catch (IOException e) {
-            }
-        } catch (FileNotFoundException e) {
-            System.out.println("File " + fname +
-                " Not found.");
-            System.exit(1);
-        }
-        curDir = tmpDir;
-        curFileName = tmpFile;
-        {if (true) return ret;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public ArrayList<JRecord> Module() throws ParseException {
-    String mName;
-    ArrayList<JRecord> rlist;
-    jj_consume_token(MODULE_TKN);
-    mName = ModuleName();
-      curModuleName = mName;
-    jj_consume_token(LBRACE_TKN);
-    rlist = RecordList();
-    jj_consume_token(RBRACE_TKN);
-      {if (true) return rlist;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public String ModuleName() throws ParseException {
-    String name = "";
-    Token t;
-    t = jj_consume_token(IDENT_TKN);
-      name += t.image;
-    label_2:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DOT_TKN:
-        ;
-        break;
-      default:
-        jj_la1[2] = jj_gen;
-        break label_2;
-      }
-      jj_consume_token(DOT_TKN);
-      t = jj_consume_token(IDENT_TKN);
-          name += "." + t.image;
-    }
-      {if (true) return name;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public ArrayList<JRecord> RecordList() throws ParseException {
-    ArrayList<JRecord> rlist = new ArrayList<JRecord>();
-    JRecord r;
-    label_3:
-    while (true) {
-      r = Record();
-          rlist.add(r);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case RECORD_TKN:
-        ;
-        break;
-      default:
-        jj_la1[3] = jj_gen;
-        break label_3;
-      }
-    }
-      {if (true) return rlist;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JRecord Record() throws ParseException {
-    String rname;
-    ArrayList<JField> flist = new ArrayList<JField>();
-    Token t;
-    JField f;
-    jj_consume_token(RECORD_TKN);
-    t = jj_consume_token(IDENT_TKN);
-      rname = t.image;
-    jj_consume_token(LBRACE_TKN);
-    label_4:
-    while (true) {
-      f = Field();
-          flist.add(f);
-      jj_consume_token(SEMICOLON_TKN);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case BYTE_TKN:
-      case BOOLEAN_TKN:
-      case INT_TKN:
-      case LONG_TKN:
-      case FLOAT_TKN:
-      case DOUBLE_TKN:
-      case USTRING_TKN:
-      case BUFFER_TKN:
-      case VECTOR_TKN:
-      case MAP_TKN:
-      case IDENT_TKN:
-        ;
-        break;
-      default:
-        jj_la1[4] = jj_gen;
-        break label_4;
-      }
-    }
-    jj_consume_token(RBRACE_TKN);
-        String fqn = curModuleName + "." + rname;
-        JRecord r = new JRecord(fqn, flist);
-        recTab.put(fqn, r);
-        {if (true) return r;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JField Field() throws ParseException {
-    JType jt;
-    Token t;
-    jt = Type();
-    t = jj_consume_token(IDENT_TKN);
-      {if (true) return new JField(jt, t.image);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JType Type() throws ParseException {
-    JType jt;
-    Token t;
-    String rname;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case MAP_TKN:
-      jt = Map();
-      {if (true) return jt;}
-      break;
-    case VECTOR_TKN:
-      jt = Vector();
-      {if (true) return jt;}
-      break;
-    case BYTE_TKN:
-      jj_consume_token(BYTE_TKN);
-      {if (true) return new JByte();}
-      break;
-    case BOOLEAN_TKN:
-      jj_consume_token(BOOLEAN_TKN);
-      {if (true) return new JBoolean();}
-      break;
-    case INT_TKN:
-      jj_consume_token(INT_TKN);
-      {if (true) return new JInt();}
-      break;
-    case LONG_TKN:
-      jj_consume_token(LONG_TKN);
-      {if (true) return new JLong();}
-      break;
-    case FLOAT_TKN:
-      jj_consume_token(FLOAT_TKN);
-      {if (true) return new JFloat();}
-      break;
-    case DOUBLE_TKN:
-      jj_consume_token(DOUBLE_TKN);
-      {if (true) return new JDouble();}
-      break;
-    case USTRING_TKN:
-      jj_consume_token(USTRING_TKN);
-      {if (true) return new JString();}
-      break;
-    case BUFFER_TKN:
-      jj_consume_token(BUFFER_TKN);
-      {if (true) return new JBuffer();}
-      break;
-    case IDENT_TKN:
-      rname = ModuleName();
-        if (rname.indexOf('.', 0) < 0) {
-            rname = curModuleName + "." + rname;
-        }
-        JRecord r = recTab.get(rname);
-        if (r == null) {
-            System.out.println("Type " + rname + " not known. Exiting.");
-            System.exit(1);
-        }
-        {if (true) return r;}
-      break;
-    default:
-      jj_la1[5] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JMap Map() throws ParseException {
-    JType jt1;
-    JType jt2;
-    jj_consume_token(MAP_TKN);
-    jj_consume_token(LT_TKN);
-    jt1 = Type();
-    jj_consume_token(COMMA_TKN);
-    jt2 = Type();
-    jj_consume_token(GT_TKN);
-      {if (true) return new JMap(jt1, jt2);}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public JVector Vector() throws ParseException {
-    JType jt;
-    jj_consume_token(VECTOR_TKN);
-    jj_consume_token(LT_TKN);
-    jt = Type();
-    jj_consume_token(GT_TKN);
-      {if (true) return new JVector(jt);}
-    throw new Error("Missing return statement in function");
-  }
-
-  /** Generated Token Manager. */
-  public RccTokenManager token_source;
-  SimpleCharStream jj_input_stream;
-  /** Current token. */
-  public Token token;
-  /** Next token. */
-  public Token jj_nt;
-  private int jj_ntk;
-  private int jj_gen;
-  final private int[] jj_la1 = new int[6];
-  static private int[] jj_la1_0;
-  static private int[] jj_la1_1;
-  static {
-      jj_la1_init_0();
-      jj_la1_init_1();
-   }
-   private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x2800,0x2800,0x40000000,0x1000,0xffc000,0xffc000,};
-   }
-   private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x1,0x1,};
-   }
-
-  /** Constructor with InputStream. */
-  public Rcc(java.io.InputStream stream) {
-     this(stream, null);
-  }
-  /** Constructor with InputStream and supplied encoding */
-  public Rcc(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source = new RccTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream) {
-     ReInit(stream, null);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream stream, String encoding) {
-    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  /** Constructor. */
-  public Rcc(java.io.Reader stream) {
-    jj_input_stream = new SimpleCharStream(stream, 1, 1);
-    token_source = new RccTokenManager(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader stream) {
-    jj_input_stream.ReInit(stream, 1, 1);
-    token_source.ReInit(jj_input_stream);
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  /** Constructor with generated Token Manager. */
-  public Rcc(RccTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(RccTokenManager tm) {
-    token_source = tm;
-    token = new Token();
-    jj_ntk = -1;
-    jj_gen = 0;
-    for (int i = 0; i < 6; i++) jj_la1[i] = -1;
-  }
-
-  private Token jj_consume_token(int kind) throws ParseException {
-    Token oldToken;
-    if ((oldToken = token).next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    if (token.kind == kind) {
-      jj_gen++;
-      return token;
-    }
-    token = oldToken;
-    jj_kind = kind;
-    throw generateParseException();
-  }
-
-
-/** Get the next Token. */
-  final public Token getNextToken() {
-    if (token.next != null) token = token.next;
-    else token = token.next = token_source.getNextToken();
-    jj_ntk = -1;
-    jj_gen++;
-    return token;
-  }
-
-/** Get the specific Token. */
-  final public Token getToken(int index) {
-    Token t = token;
-    for (int i = 0; i < index; i++) {
-      if (t.next != null) t = t.next;
-      else t = t.next = token_source.getNextToken();
-    }
-    return t;
-  }
-
-  private int jj_ntk() {
-    if ((jj_nt=token.next) == null)
-      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
-    else
-      return (jj_ntk = jj_nt.kind);
-  }
-
-  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-  private int[] jj_expentry;
-  private int jj_kind = -1;
-
-  /** Generate ParseException. */
-  public ParseException generateParseException() {
-    jj_expentries.clear();
-    boolean[] la1tokens = new boolean[33];
-    if (jj_kind >= 0) {
-      la1tokens[jj_kind] = true;
-      jj_kind = -1;
-    }
-    for (int i = 0; i < 6; i++) {
-      if (jj_la1[i] == jj_gen) {
-        for (int j = 0; j < 32; j++) {
-          if ((jj_la1_0[i] & (1<<j)) != 0) {
-            la1tokens[j] = true;
-          }
-          if ((jj_la1_1[i] & (1<<j)) != 0) {
-            la1tokens[32+j] = true;
-          }
-        }
-      }
-    }
-    for (int i = 0; i < 33; i++) {
-      if (la1tokens[i]) {
-        jj_expentry = new int[1];
-        jj_expentry[0] = i;
-        jj_expentries.add(jj_expentry);
-      }
-    }
-    int[][] exptokseq = new int[jj_expentries.size()][];
-    for (int i = 0; i < jj_expentries.size(); i++) {
-      exptokseq[i] = jj_expentries.get(i);
-    }
-    return new ParseException(token, exptokseq, tokenImage);
-  }
-
-  /** Enable tracing. */
-  final public void enable_tracing() {
-  }
-
-  /** Disable tracing. */
-  final public void disable_tracing() {
-  }
-
-}
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccConstants.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccConstants.java
deleted file mode 100644
index f1caa354..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccConstants.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. RccConstants.java */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-
-/**
- * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
- */
-public interface RccConstants {
-
-  /** End of File. */
-  int EOF = 0;
-  /** RegularExpression Id. */
-  int MODULE_TKN = 11;
-  /** RegularExpression Id. */
-  int RECORD_TKN = 12;
-  /** RegularExpression Id. */
-  int INCLUDE_TKN = 13;
-  /** RegularExpression Id. */
-  int BYTE_TKN = 14;
-  /** RegularExpression Id. */
-  int BOOLEAN_TKN = 15;
-  /** RegularExpression Id. */
-  int INT_TKN = 16;
-  /** RegularExpression Id. */
-  int LONG_TKN = 17;
-  /** RegularExpression Id. */
-  int FLOAT_TKN = 18;
-  /** RegularExpression Id. */
-  int DOUBLE_TKN = 19;
-  /** RegularExpression Id. */
-  int USTRING_TKN = 20;
-  /** RegularExpression Id. */
-  int BUFFER_TKN = 21;
-  /** RegularExpression Id. */
-  int VECTOR_TKN = 22;
-  /** RegularExpression Id. */
-  int MAP_TKN = 23;
-  /** RegularExpression Id. */
-  int LBRACE_TKN = 24;
-  /** RegularExpression Id. */
-  int RBRACE_TKN = 25;
-  /** RegularExpression Id. */
-  int LT_TKN = 26;
-  /** RegularExpression Id. */
-  int GT_TKN = 27;
-  /** RegularExpression Id. */
-  int SEMICOLON_TKN = 28;
-  /** RegularExpression Id. */
-  int COMMA_TKN = 29;
-  /** RegularExpression Id. */
-  int DOT_TKN = 30;
-  /** RegularExpression Id. */
-  int CSTRING_TKN = 31;
-  /** RegularExpression Id. */
-  int IDENT_TKN = 32;
-
-  /** Lexical state. */
-  int DEFAULT = 0;
-  /** Lexical state. */
-  int WithinOneLineComment = 1;
-  /** Lexical state. */
-  int WithinMultiLineComment = 2;
-
-  /** Literal token values. */
-  String[] tokenImage = {
-    "<EOF>",
-    "\" \"",
-    "\"\\t\"",
-    "\"\\n\"",
-    "\"\\r\"",
-    "\"//\"",
-    "<token of kind 6>",
-    "<token of kind 7>",
-    "\"/*\"",
-    "\"*/\"",
-    "<token of kind 10>",
-    "\"module\"",
-    "\"class\"",
-    "\"include\"",
-    "\"byte\"",
-    "\"boolean\"",
-    "\"int\"",
-    "\"long\"",
-    "\"float\"",
-    "\"double\"",
-    "\"ustring\"",
-    "\"buffer\"",
-    "\"vector\"",
-    "\"map\"",
-    "\"{\"",
-    "\"}\"",
-    "\"<\"",
-    "\">\"",
-    "\";\"",
-    "\",\"",
-    "\".\"",
-    "<CSTRING_TKN>",
-    "<IDENT_TKN>",
-  };
-
-}
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccTokenManager.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccTokenManager.java
deleted file mode 100644
index a6058215..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/RccTokenManager.java
+++ /dev/null
@@ -1,852 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. RccTokenManager.java */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-import org.apache.jute.compiler.*;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-/** Token Manager. */
-public class RccTokenManager implements RccConstants
-{
-
-  /** Debug output. */
-  public  java.io.PrintStream debugStream = System.out;
-  /** Set debug output. */
-  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private int jjMoveStringLiteralDfa0_1()
-{
-   return jjMoveNfa_1(0, 0);
-}
-private int jjMoveNfa_1(int startState, int curPos)
-{
-   int startsAt = 0;
-   jjnewStateCnt = 3;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 0:
-                  if ((0x2400L & l) != 0L)
-                  {
-                     if (kind > 6)
-                        kind = 6;
-                  }
-                  if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 1;
-                  break;
-               case 1:
-                  if (curChar == 10 && kind > 6)
-                     kind = 6;
-                  break;
-               case 2:
-                  if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 1;
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
-         return curPos;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { return curPos; }
-   }
-}
-private final int jjStopStringLiteralDfa_0(int pos, long active0)
-{
-   switch (pos)
-   {
-      case 0:
-         if ((active0 & 0xfff800L) != 0L)
-         {
-            jjmatchedKind = 32;
-            return 4;
-         }
-         return -1;
-      case 1:
-         if ((active0 & 0xfff800L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 1;
-            return 4;
-         }
-         return -1;
-      case 2:
-         if ((active0 & 0x7ef800L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 2;
-            return 4;
-         }
-         if ((active0 & 0x810000L) != 0L)
-            return 4;
-         return -1;
-      case 3:
-         if ((active0 & 0x24000L) != 0L)
-            return 4;
-         if ((active0 & 0x7cb800L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 3;
-            return 4;
-         }
-         return -1;
-      case 4:
-         if ((active0 & 0x41000L) != 0L)
-            return 4;
-         if ((active0 & 0x78a800L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 4;
-            return 4;
-         }
-         return -1;
-      case 5:
-         if ((active0 & 0x680800L) != 0L)
-            return 4;
-         if ((active0 & 0x10a000L) != 0L)
-         {
-            jjmatchedKind = 32;
-            jjmatchedPos = 5;
-            return 4;
-         }
-         return -1;
-      default :
-         return -1;
-   }
-}
-private final int jjStartNfa_0(int pos, long active0)
-{
-   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
-}
-private int jjStopAtPos(int pos, int kind)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   return pos + 1;
-}
-private int jjMoveStringLiteralDfa0_0()
-{
-   switch(curChar)
-   {
-      case 44:
-         return jjStopAtPos(0, 29);
-      case 46:
-         return jjStopAtPos(0, 30);
-      case 47:
-         return jjMoveStringLiteralDfa1_0(0x120L);
-      case 59:
-         return jjStopAtPos(0, 28);
-      case 60:
-         return jjStopAtPos(0, 26);
-      case 62:
-         return jjStopAtPos(0, 27);
-      case 98:
-         return jjMoveStringLiteralDfa1_0(0x20c000L);
-      case 99:
-         return jjMoveStringLiteralDfa1_0(0x1000L);
-      case 100:
-         return jjMoveStringLiteralDfa1_0(0x80000L);
-      case 102:
-         return jjMoveStringLiteralDfa1_0(0x40000L);
-      case 105:
-         return jjMoveStringLiteralDfa1_0(0x12000L);
-      case 108:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
-      case 109:
-         return jjMoveStringLiteralDfa1_0(0x800800L);
-      case 117:
-         return jjMoveStringLiteralDfa1_0(0x100000L);
-      case 118:
-         return jjMoveStringLiteralDfa1_0(0x400000L);
-      case 123:
-         return jjStopAtPos(0, 24);
-      case 125:
-         return jjStopAtPos(0, 25);
-      default :
-         return jjMoveNfa_0(0, 0);
-   }
-}
-private int jjMoveStringLiteralDfa1_0(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(0, active0);
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 42:
-         if ((active0 & 0x100L) != 0L)
-            return jjStopAtPos(1, 8);
-         break;
-      case 47:
-         if ((active0 & 0x20L) != 0L)
-            return jjStopAtPos(1, 5);
-         break;
-      case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000L);
-      case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000L);
-      case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x41000L);
-      case 110:
-         return jjMoveStringLiteralDfa2_0(active0, 0x12000L);
-      case 111:
-         return jjMoveStringLiteralDfa2_0(active0, 0xa8800L);
-      case 115:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100000L);
-      case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
-      case 121:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(0, active0);
-}
-private int jjMoveStringLiteralDfa2_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(0, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(1, active0);
-      return 2;
-   }
-   switch(curChar)
-   {
-      case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
-      case 99:
-         return jjMoveStringLiteralDfa3_0(active0, 0x402000L);
-      case 100:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800L);
-      case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000L);
-      case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
-      case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x48000L);
-      case 112:
-         if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_0(2, 23, 4);
-         break;
-      case 116:
-         if ((active0 & 0x10000L) != 0L)
-            return jjStartNfaWithStates_0(2, 16, 4);
-         return jjMoveStringLiteralDfa3_0(active0, 0x104000L);
-      case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(1, active0);
-}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(1, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(2, active0);
-      return 3;
-   }
-   switch(curChar)
-   {
-      case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000L);
-      case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
-      case 101:
-         if ((active0 & 0x4000L) != 0L)
-            return jjStartNfaWithStates_0(3, 14, 4);
-         break;
-      case 102:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000L);
-      case 103:
-         if ((active0 & 0x20000L) != 0L)
-            return jjStartNfaWithStates_0(3, 17, 4);
-         break;
-      case 108:
-         return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
-      case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
-      case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000L);
-      case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L);
-      case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(2, active0);
-}
-private int jjMoveStringLiteralDfa4_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(2, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(3, active0);
-      return 4;
-   }
-   switch(curChar)
-   {
-      case 101:
-         return jjMoveStringLiteralDfa5_0(active0, 0x208000L);
-      case 105:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
-      case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x80800L);
-      case 111:
-         return jjMoveStringLiteralDfa5_0(active0, 0x400000L);
-      case 115:
-         if ((active0 & 0x1000L) != 0L)
-            return jjStartNfaWithStates_0(4, 12, 4);
-         break;
-      case 116:
-         if ((active0 & 0x40000L) != 0L)
-            return jjStartNfaWithStates_0(4, 18, 4);
-         break;
-      case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000L);
-      default :
-         break;
-   }
-   return jjStartNfa_0(3, active0);
-}
-private int jjMoveStringLiteralDfa5_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(3, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(4, active0);
-      return 5;
-   }
-   switch(curChar)
-   {
-      case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000L);
-      case 100:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000L);
-      case 101:
-         if ((active0 & 0x800L) != 0L)
-            return jjStartNfaWithStates_0(5, 11, 4);
-         else if ((active0 & 0x80000L) != 0L)
-            return jjStartNfaWithStates_0(5, 19, 4);
-         break;
-      case 110:
-         return jjMoveStringLiteralDfa6_0(active0, 0x100000L);
-      case 114:
-         if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_0(5, 21, 4);
-         else if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_0(5, 22, 4);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_0(4, active0);
-}
-private int jjMoveStringLiteralDfa6_0(long old0, long active0)
-{
-   if (((active0 &= old0)) == 0L)
-      return jjStartNfa_0(4, old0);
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      jjStopStringLiteralDfa_0(5, active0);
-      return 6;
-   }
-   switch(curChar)
-   {
-      case 101:
-         if ((active0 & 0x2000L) != 0L)
-            return jjStartNfaWithStates_0(6, 13, 4);
-         break;
-      case 103:
-         if ((active0 & 0x100000L) != 0L)
-            return jjStartNfaWithStates_0(6, 20, 4);
-         break;
-      case 110:
-         if ((active0 & 0x8000L) != 0L)
-            return jjStartNfaWithStates_0(6, 15, 4);
-         break;
-      default :
-         break;
-   }
-   return jjStartNfa_0(5, active0);
-}
-private int jjStartNfaWithStates_0(int pos, int kind, int state)
-{
-   jjmatchedKind = kind;
-   jjmatchedPos = pos;
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) { return pos + 1; }
-   return jjMoveNfa_0(state, pos + 1);
-}
-static final long[] jjbitVec0 = {
-   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-};
-private int jjMoveNfa_0(int startState, int curPos)
-{
-   int startsAt = 0;
-   jjnewStateCnt = 5;
-   int i = 1;
-   jjstateSet[0] = startState;
-   int kind = 0x7fffffff;
-   for (;;)
-   {
-      if (++jjround == 0x7fffffff)
-         ReInitRounds();
-      if (curChar < 64)
-      {
-         long l = 1L << curChar;
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 0:
-                  if (curChar == 34)
-                     jjCheckNAdd(1);
-                  break;
-               case 1:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     jjCheckNAddTwoStates(1, 2);
-                  break;
-               case 2:
-                  if (curChar == 34 && kind > 31)
-                     kind = 31;
-                  break;
-               case 4:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 32)
-                     kind = 32;
-                  jjstateSet[jjnewStateCnt++] = 4;
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else if (curChar < 128)
-      {
-         long l = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 0:
-                  if ((0x7fffffe07fffffeL & l) == 0L)
-                     break;
-                  if (kind > 32)
-                     kind = 32;
-                  jjCheckNAdd(4);
-                  break;
-               case 1:
-                  jjAddStates(0, 1);
-                  break;
-               case 4:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 32)
-                     kind = 32;
-                  jjCheckNAdd(4);
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      else
-      {
-         int i2 = (curChar & 0xff) >> 6;
-         long l2 = 1L << (curChar & 077);
-         do
-         {
-            switch(jjstateSet[--i])
-            {
-               case 1:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     jjAddStates(0, 1);
-                  break;
-               default : break;
-            }
-         } while(i != startsAt);
-      }
-      if (kind != 0x7fffffff)
-      {
-         jjmatchedKind = kind;
-         jjmatchedPos = curPos;
-         kind = 0x7fffffff;
-      }
-      ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 5 - (jjnewStateCnt = startsAt)))
-         return curPos;
-      try { curChar = input_stream.readChar(); }
-      catch(java.io.IOException e) { return curPos; }
-   }
-}
-private int jjMoveStringLiteralDfa0_2()
-{
-   switch(curChar)
-   {
-      case 42:
-         return jjMoveStringLiteralDfa1_2(0x200L);
-      default :
-         return 1;
-   }
-}
-private int jjMoveStringLiteralDfa1_2(long active0)
-{
-   try { curChar = input_stream.readChar(); }
-   catch(java.io.IOException e) {
-      return 1;
-   }
-   switch(curChar)
-   {
-      case 47:
-         if ((active0 & 0x200L) != 0L)
-            return jjStopAtPos(1, 9);
-         break;
-      default :
-         return 2;
-   }
-   return 2;
-}
-static final int[] jjnextStates = {
-   1, 2, 
-};
-
-/** Token literal values. */
-public static final String[] jjstrLiteralImages = {
-"", null, null, null, null, null, null, null, null, null, null, 
-"\155\157\144\165\154\145", "\143\154\141\163\163", "\151\156\143\154\165\144\145", "\142\171\164\145", 
-"\142\157\157\154\145\141\156", "\151\156\164", "\154\157\156\147", "\146\154\157\141\164", 
-"\144\157\165\142\154\145", "\165\163\164\162\151\156\147", "\142\165\146\146\145\162", 
-"\166\145\143\164\157\162", "\155\141\160", "\173", "\175", "\74", "\76", "\73", "\54", "\56", null, null, };
-
-/** Lexer state names. */
-public static final String[] lexStateNames = {
-   "DEFAULT",
-   "WithinOneLineComment",
-   "WithinMultiLineComment",
-};
-
-/** Lex State array. */
-public static final int[] jjnewLexState = {
-   -1, -1, -1, -1, -1, 1, 0, -1, 2, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, 
-};
-static final long[] jjtoToken = {
-   0x1fffff801L, 
-};
-static final long[] jjtoSkip = {
-   0x37eL, 
-};
-static final long[] jjtoSpecial = {
-   0x360L, 
-};
-static final long[] jjtoMore = {
-   0x480L, 
-};
-protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[5];
-private final int[] jjstateSet = new int[10];
-private final StringBuilder jjimage = new StringBuilder();
-private StringBuilder image = jjimage;
-private int jjimageLen;
-private int lengthOfMatch;
-protected char curChar;
-/** Constructor. */
-public RccTokenManager(SimpleCharStream stream){
-   if (SimpleCharStream.staticFlag)
-      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-   input_stream = stream;
-}
-
-/** Constructor. */
-public RccTokenManager(SimpleCharStream stream, int lexState){
-   this(stream);
-   SwitchTo(lexState);
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream)
-{
-   jjmatchedPos = jjnewStateCnt = 0;
-   curLexState = defaultLexState;
-   input_stream = stream;
-   ReInitRounds();
-}
-private void ReInitRounds()
-{
-   int i;
-   jjround = 0x80000001;
-   for (i = 5; i-- > 0;)
-      jjrounds[i] = 0x80000000;
-}
-
-/** Reinitialise parser. */
-public void ReInit(SimpleCharStream stream, int lexState)
-{
-   ReInit(stream);
-   SwitchTo(lexState);
-}
-
-/** Switch to specified lex state. */
-public void SwitchTo(int lexState)
-{
-   if (lexState >= 3 || lexState < 0)
-      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-   else
-      curLexState = lexState;
-}
-
-protected Token jjFillToken()
-{
-   final Token t;
-   final String curTokenImage;
-   final int beginLine;
-   final int endLine;
-   final int beginColumn;
-   final int endColumn;
-   String im = jjstrLiteralImages[jjmatchedKind];
-   curTokenImage = (im == null) ? input_stream.GetImage() : im;
-   beginLine = input_stream.getBeginLine();
-   beginColumn = input_stream.getBeginColumn();
-   endLine = input_stream.getEndLine();
-   endColumn = input_stream.getEndColumn();
-   t = Token.newToken(jjmatchedKind, curTokenImage);
-
-   t.beginLine = beginLine;
-   t.endLine = endLine;
-   t.beginColumn = beginColumn;
-   t.endColumn = endColumn;
-
-   return t;
-}
-
-int curLexState = 0;
-int defaultLexState = 0;
-int jjnewStateCnt;
-int jjround;
-int jjmatchedPos;
-int jjmatchedKind;
-
-/** Get the next Token. */
-public Token getNextToken() 
-{
-  Token specialToken = null;
-  Token matchedToken;
-  int curPos = 0;
-
-  EOFLoop :
-  for (;;)
-  {
-   try
-   {
-      curChar = input_stream.BeginToken();
-   }
-   catch(java.io.IOException e)
-   {
-      jjmatchedKind = 0;
-      matchedToken = jjFillToken();
-      matchedToken.specialToken = specialToken;
-      return matchedToken;
-   }
-   image = jjimage;
-   image.setLength(0);
-   jjimageLen = 0;
-
-   for (;;)
-   {
-     switch(curLexState)
-     {
-       case 0:
-         try { input_stream.backup(0);
-            while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L)
-               curChar = input_stream.BeginToken();
-         }
-         catch (java.io.IOException e1) { continue EOFLoop; }
-         jjmatchedKind = 0x7fffffff;
-         jjmatchedPos = 0;
-         curPos = jjMoveStringLiteralDfa0_0();
-         break;
-       case 1:
-         jjmatchedKind = 0x7fffffff;
-         jjmatchedPos = 0;
-         curPos = jjMoveStringLiteralDfa0_1();
-         if (jjmatchedPos == 0 && jjmatchedKind > 7)
-         {
-            jjmatchedKind = 7;
-         }
-         break;
-       case 2:
-         jjmatchedKind = 0x7fffffff;
-         jjmatchedPos = 0;
-         curPos = jjMoveStringLiteralDfa0_2();
-         if (jjmatchedPos == 0 && jjmatchedKind > 10)
-         {
-            jjmatchedKind = 10;
-         }
-         break;
-     }
-     if (jjmatchedKind != 0x7fffffff)
-     {
-        if (jjmatchedPos + 1 < curPos)
-           input_stream.backup(curPos - jjmatchedPos - 1);
-        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
-        {
-           matchedToken = jjFillToken();
-           matchedToken.specialToken = specialToken;
-       if (jjnewLexState[jjmatchedKind] != -1)
-         curLexState = jjnewLexState[jjmatchedKind];
-           return matchedToken;
-        }
-        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
-        {
-           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
-           {
-              matchedToken = jjFillToken();
-              if (specialToken == null)
-                 specialToken = matchedToken;
-              else
-              {
-                 matchedToken.specialToken = specialToken;
-                 specialToken = (specialToken.next = matchedToken);
-              }
-              SkipLexicalActions(matchedToken);
-           }
-           else
-              SkipLexicalActions(null);
-         if (jjnewLexState[jjmatchedKind] != -1)
-           curLexState = jjnewLexState[jjmatchedKind];
-           continue EOFLoop;
-        }
-        jjimageLen += jjmatchedPos + 1;
-      if (jjnewLexState[jjmatchedKind] != -1)
-        curLexState = jjnewLexState[jjmatchedKind];
-        curPos = 0;
-        jjmatchedKind = 0x7fffffff;
-        try {
-           curChar = input_stream.readChar();
-           continue;
-        }
-        catch (java.io.IOException e1) { }
-     }
-     int error_line = input_stream.getEndLine();
-     int error_column = input_stream.getEndColumn();
-     String error_after = null;
-     boolean EOFSeen = false;
-     try { input_stream.readChar(); input_stream.backup(1); }
-     catch (java.io.IOException e1) {
-        EOFSeen = true;
-        error_after = curPos <= 1 ? "" : input_stream.GetImage();
-        if (curChar == '\n' || curChar == '\r') {
-           error_line++;
-           error_column = 0;
-        }
-        else
-           error_column++;
-     }
-     if (!EOFSeen) {
-        input_stream.backup(1);
-        error_after = curPos <= 1 ? "" : input_stream.GetImage();
-     }
-     throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
-   }
-  }
-}
-
-void SkipLexicalActions(Token matchedToken)
-{
-   switch(jjmatchedKind)
-   {
-      default :
-         break;
-   }
-}
-private void jjCheckNAdd(int state)
-{
-   if (jjrounds[state] != jjround)
-   {
-      jjstateSet[jjnewStateCnt++] = state;
-      jjrounds[state] = jjround;
-   }
-}
-private void jjAddStates(int start, int end)
-{
-   do {
-      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-   } while (start++ != end);
-}
-private void jjCheckNAddTwoStates(int state1, int state2)
-{
-   jjCheckNAdd(state1);
-   jjCheckNAdd(state2);
-}
-
-}
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/SimpleCharStream.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/SimpleCharStream.java
deleted file mode 100644
index 9f22eefd..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/SimpleCharStream.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
-/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-/**
- * An implementation of interface CharStream, where the stream is assumed to
- * contain only ASCII characters (without unicode processing).
- */
-
-public class SimpleCharStream
-{
-/** Whether parser is static. */
-  public static final boolean staticFlag = false;
-  int bufsize;
-  int available;
-  int tokenBegin;
-/** Position in buffer. */
-  public int bufpos = -1;
-  protected int bufline[];
-  protected int bufcolumn[];
-
-  protected int column = 0;
-  protected int line = 1;
-
-  protected boolean prevCharIsCR = false;
-  protected boolean prevCharIsLF = false;
-
-  protected java.io.Reader inputStream;
-
-  protected char[] buffer;
-  protected int maxNextCharInd = 0;
-  protected int inBuf = 0;
-  protected int tabSize = 8;
-
-  protected void setTabSize(int i) { tabSize = i; }
-  protected int getTabSize(int i) { return tabSize; }
-
-
-  protected void ExpandBuff(boolean wrapAround)
-  {
-    char[] newbuffer = new char[bufsize + 2048];
-    int newbufline[] = new int[bufsize + 2048];
-    int newbufcolumn[] = new int[bufsize + 2048];
-
-    try
-    {
-      if (wrapAround)
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-        bufcolumn = newbufcolumn;
-
-        maxNextCharInd = (bufpos += (bufsize - tokenBegin));
-      }
-      else
-      {
-        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-        buffer = newbuffer;
-
-        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-        bufline = newbufline;
-
-        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-        bufcolumn = newbufcolumn;
-
-        maxNextCharInd = (bufpos -= tokenBegin);
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new Error(t.getMessage());
-    }
-
-
-    bufsize += 2048;
-    available = bufsize;
-    tokenBegin = 0;
-  }
-
-  protected void FillBuff() throws java.io.IOException
-  {
-    if (maxNextCharInd == available)
-    {
-      if (available == bufsize)
-      {
-        if (tokenBegin > 2048)
-        {
-          bufpos = maxNextCharInd = 0;
-          available = tokenBegin;
-        }
-        else if (tokenBegin < 0)
-          bufpos = maxNextCharInd = 0;
-        else
-          ExpandBuff(false);
-      }
-      else if (available > tokenBegin)
-        available = bufsize;
-      else if ((tokenBegin - available) < 2048)
-        ExpandBuff(true);
-      else
-        available = tokenBegin;
-    }
-
-    int i;
-    try {
-      if ((i = inputStream.read(buffer, maxNextCharInd, available - maxNextCharInd)) == -1)
-      {
-        inputStream.close();
-        throw new java.io.IOException();
-      }
-      else
-        maxNextCharInd += i;
-      return;
-    }
-    catch(java.io.IOException e) {
-      --bufpos;
-      backup(0);
-      if (tokenBegin == -1)
-        tokenBegin = bufpos;
-      throw e;
-    }
-  }
-
-/** Start. */
-  public char BeginToken() throws java.io.IOException
-  {
-    tokenBegin = -1;
-    char c = readChar();
-    tokenBegin = bufpos;
-
-    return c;
-  }
-
-  protected void UpdateLineColumn(char c)
-  {
-    column++;
-
-    if (prevCharIsLF)
-    {
-      prevCharIsLF = false;
-      line += (column = 1);
-    }
-    else if (prevCharIsCR)
-    {
-      prevCharIsCR = false;
-      if (c == '\n')
-      {
-        prevCharIsLF = true;
-      }
-      else
-        line += (column = 1);
-    }
-
-    switch (c)
-    {
-      case '\r' :
-        prevCharIsCR = true;
-        break;
-      case '\n' :
-        prevCharIsLF = true;
-        break;
-      case '\t' :
-        column--;
-        column += (tabSize - (column % tabSize));
-        break;
-      default :
-        break;
-    }
-
-    bufline[bufpos] = line;
-    bufcolumn[bufpos] = column;
-  }
-
-/** Read a character. */
-  public char readChar() throws java.io.IOException
-  {
-    if (inBuf > 0)
-    {
-      --inBuf;
-
-      if (++bufpos == bufsize)
-        bufpos = 0;
-
-      return buffer[bufpos];
-    }
-
-    if (++bufpos >= maxNextCharInd)
-      FillBuff();
-
-    char c = buffer[bufpos];
-
-    UpdateLineColumn(c);
-    return c;
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndColumn
-   */
-
-  public int getColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  @Deprecated
-  /**
-   * @deprecated
-   * @see #getEndLine
-   */
-
-  public int getLine() {
-    return bufline[bufpos];
-  }
-
-  /** Get token end column number. */
-  public int getEndColumn() {
-    return bufcolumn[bufpos];
-  }
-
-  /** Get token end line number. */
-  public int getEndLine() {
-     return bufline[bufpos];
-  }
-
-  /** Get token beginning column number. */
-  public int getBeginColumn() {
-    return bufcolumn[tokenBegin];
-  }
-
-  /** Get token beginning line number. */
-  public int getBeginLine() {
-    return bufline[tokenBegin];
-  }
-
-/** Backup a number of characters. */
-  public void backup(int amount) {
-
-    inBuf += amount;
-    if ((bufpos -= amount) < 0)
-      bufpos += bufsize;
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    available = bufsize = buffersize;
-    buffer = new char[buffersize];
-    bufline = new int[buffersize];
-    bufcolumn = new int[buffersize];
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream, int startline,
-                          int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.Reader dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    inputStream = dstream;
-    line = startline;
-    column = startcolumn - 1;
-
-    if (buffer == null || buffersize != buffer.length)
-    {
-      available = bufsize = buffersize;
-      buffer = new char[buffersize];
-      bufline = new int[buffersize];
-      bufcolumn = new int[buffersize];
-    }
-    prevCharIsLF = prevCharIsCR = false;
-    tokenBegin = inBuf = maxNextCharInd = 0;
-    bufpos = -1;
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.Reader dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
-  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, int startline,
-  int startcolumn, int buffersize)
-  {
-    this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, int startline,
-                          int startcolumn)
-  {
-    this(dstream, startline, startcolumn, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    this(dstream, encoding, 1, 1, 4096);
-  }
-
-  /** Constructor. */
-  public SimpleCharStream(java.io.InputStream dstream)
-  {
-    this(dstream, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                          int startcolumn, int buffersize)
-  {
-    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, 1, 1, 4096);
-  }
-
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream)
-  {
-    ReInit(dstream, 1, 1, 4096);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                     int startcolumn) throws java.io.UnsupportedEncodingException
-  {
-    ReInit(dstream, encoding, startline, startcolumn, 4096);
-  }
-  /** Reinitialise. */
-  public void ReInit(java.io.InputStream dstream, int startline,
-                     int startcolumn)
-  {
-    ReInit(dstream, startline, startcolumn, 4096);
-  }
-  /** Get token literal value. */
-  public String GetImage()
-  {
-    if (bufpos >= tokenBegin)
-      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
-    else
-      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                            new String(buffer, 0, bufpos + 1);
-  }
-
-  /** Get the suffix. */
-  public char[] GetSuffix(int len)
-  {
-    char[] ret = new char[len];
-
-    if ((bufpos + 1) >= len)
-      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-    else
-    {
-      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                                                        len - bufpos - 1);
-      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-    }
-
-    return ret;
-  }
-
-  /** Reset buffer when finished. */
-  public void Done()
-  {
-    buffer = null;
-    bufline = null;
-    bufcolumn = null;
-  }
-
-  /**
-   * Method to adjust line and column numbers for the start of a token.
-   */
-  public void adjustBeginLineColumn(int newLine, int newCol)
-  {
-    int start = tokenBegin;
-    int len;
-
-    if (bufpos >= tokenBegin)
-    {
-      len = bufpos - tokenBegin + inBuf + 1;
-    }
-    else
-    {
-      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-    }
-
-    int i = 0, j = 0, k = 0;
-    int nextColDiff = 0, columnDiff = 0;
-
-    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
-    {
-      bufline[j] = newLine;
-      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-      bufcolumn[j] = newCol + columnDiff;
-      columnDiff = nextColDiff;
-      i++;
-    }
-
-    if (i < len)
-    {
-      bufline[j] = newLine++;
-      bufcolumn[j] = newCol + columnDiff;
-
-      while (i++ < len)
-      {
-        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-          bufline[j] = newLine++;
-        else
-          bufline[j] = newLine;
-      }
-    }
-
-    line = bufline[j];
-    column = bufcolumn[j];
-  }
-
-}
-/* JavaCC - OriginalChecksum=dff74245833585037407fbf784002e3c (do not edit this line) */
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Token.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Token.java
deleted file mode 100644
index ed24b7ec..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/Token.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
-/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-/**
- * Describes the input token stream.
- */
-
-public class Token implements java.io.Serializable {
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * An integer that describes the kind of this token.  This numbering
-   * system is determined by JavaCCParser, and a table of these numbers is
-   * stored in the file ...Constants.java.
-   */
-  public int kind;
-
-  /** The line number of the first character of this Token. */
-  public int beginLine;
-  /** The column number of the first character of this Token. */
-  public int beginColumn;
-  /** The line number of the last character of this Token. */
-  public int endLine;
-  /** The column number of the last character of this Token. */
-  public int endColumn;
-
-  /**
-   * The string image of the token.
-   */
-  public String image;
-
-  /**
-   * A reference to the next regular (non-special) token from the input
-   * stream.  If this is the last token from the input stream, or if the
-   * token manager has not read tokens beyond this one, this field is
-   * set to null.  This is true only if this token is also a regular
-   * token.  Otherwise, see below for a description of the contents of
-   * this field.
-   */
-  public Token next;
-
-  /**
-   * This field is used to access special tokens that occur prior to this
-   * token, but after the immediately preceding regular (non-special) token.
-   * If there are no such special tokens, this field is set to null.
-   * When there are more than one such special token, this field refers
-   * to the last of these special tokens, which in turn refers to the next
-   * previous special token through its specialToken field, and so on
-   * until the first special token (whose specialToken field is null).
-   * The next fields of special tokens refer to other special tokens that
-   * immediately follow it (without an intervening regular token).  If there
-   * is no such token, this field is null.
-   */
-  public Token specialToken;
-
-  /**
-   * An optional attribute value of the Token.
-   * Tokens which are not used as syntactic sugar will often contain
-   * meaningful values that will be used later on by the compiler or
-   * interpreter. This attribute value is often different from the image.
-   * Any subclass of Token that actually wants to return a non-null value can
-   * override this method as appropriate.
-   */
-  public Object getValue() {
-    return null;
-  }
-
-  /**
-   * No-argument constructor
-   */
-  public Token() {}
-
-  /**
-   * Constructs a new token for the specified Image.
-   */
-  public Token(int kind)
-  {
-    this(kind, null);
-  }
-
-  /**
-   * Constructs a new token for the specified Image and Kind.
-   */
-  public Token(int kind, String image)
-  {
-    this.kind = kind;
-    this.image = image;
-  }
-
-  /**
-   * Returns the image.
-   */
-  public String toString()
-  {
-    return image;
-  }
-
-  /**
-   * Returns a new Token object, by default. However, if you want, you
-   * can create and return subclass objects based on the value of ofKind.
-   * Simply add the cases to the switch for all those special cases.
-   * For example, if you have a subclass of Token called IDToken that
-   * you want to create if ofKind is ID, simply add something like :
-   *
-   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
-   *
-   * to the following switch statement. Then you can cast matchedToken
-   * variable to the appropriate type and use sit in your lexical actions.
-   */
-  public static Token newToken(int ofKind, String image)
-  {
-    switch(ofKind)
-    {
-      default : return new Token(ofKind, image);
-    }
-  }
-
-  public static Token newToken(int ofKind)
-  {
-    return newToken(ofKind, null);
-  }
-
-}
-/* JavaCC - OriginalChecksum=375279e5bcdc78217a2d8ff2ea1bb1c7 (do not edit this line) */
diff --git a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/TokenMgrError.java b/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/TokenMgrError.java
deleted file mode 100644
index 452b0c36..00000000
--- a/strata/zookeeper/build/jute_compiler/org/apache/jute/compiler/generated/TokenMgrError.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
-/* JavaCCOptions: */
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jute.compiler.generated;
-
-/** Token Manager Error. */
-public class TokenMgrError extends Error
-{
-
-  /**
-   * The version identifier for this Serializable class.
-   * Increment only if the <i>serialized</i> form of the
-   * class changes.
-   */
-  private static final long serialVersionUID = 1L;
-
-  /*
-   * Ordinals for various reasons why an Error of this type can be thrown.
-   */
-
-  /**
-   * Lexical error occurred.
-   */
-  static final int LEXICAL_ERROR = 0;
-
-  /**
-   * An attempt was made to create a second instance of a static token manager.
-   */
-  static final int STATIC_LEXER_ERROR = 1;
-
-  /**
-   * Tried to change to an invalid lexical state.
-   */
-  static final int INVALID_LEXICAL_STATE = 2;
-
-  /**
-   * Detected (and bailed out of) an infinite loop in the token manager.
-   */
-  static final int LOOP_DETECTED = 3;
-
-  /**
-   * Indicates the reason why the exception is thrown. It will have
-   * one of the above 4 values.
-   */
-  int errorCode;
-
-  /**
-   * Replaces unprintable characters by their escaped (or unicode escaped)
-   * equivalents in the given string
-   */
-  protected static final String addEscapes(String str) {
-    StringBuffer retval = new StringBuffer();
-    char ch;
-    for (int i = 0; i < str.length(); i++) {
-      switch (str.charAt(i))
-      {
-        case 0 :
-          continue;
-        case '\b':
-          retval.append("\\b");
-          continue;
-        case '\t':
-          retval.append("\\t");
-          continue;
-        case '\n':
-          retval.append("\\n");
-          continue;
-        case '\f':
-          retval.append("\\f");
-          continue;
-        case '\r':
-          retval.append("\\r");
-          continue;
-        case '\"':
-          retval.append("\\\"");
-          continue;
-        case '\'':
-          retval.append("\\\'");
-          continue;
-        case '\\':
-          retval.append("\\\\");
-          continue;
-        default:
-          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-            String s = "0000" + Integer.toString(ch, 16);
-            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-          } else {
-            retval.append(ch);
-          }
-          continue;
-      }
-    }
-    return retval.toString();
-  }
-
-  /**
-   * Returns a detailed message for the Error when it is thrown by the
-   * token manager to indicate a lexical error.
-   * Parameters :
-   *    EOFSeen     : indicates if EOF caused the lexical error
-   *    curLexState : lexical state in which this error occurred
-   *    errorLine   : line number when the error occurred
-   *    errorColumn : column number when the error occurred
-   *    errorAfter  : prefix that was seen before this error occurred
-   *    curchar     : the offending character
-   * Note: You can customize the lexical error message by modifying this method.
-   */
-  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
-    return("Lexical error at line " +
-          errorLine + ", column " +
-          errorColumn + ".  Encountered: " +
-          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
-          "after : \"" + addEscapes(errorAfter) + "\"");
-  }
-
-  /**
-   * You can also modify the body of this method to customize your error messages.
-   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-   * of end-users concern, so you can return something like :
-   *
-   *     "Internal Error : Please file a bug report .... "
-   *
-   * from this method for such cases in the release version of your parser.
-   */
-  public String getMessage() {
-    return super.getMessage();
-  }
-
-  /*
-   * Constructors of various flavors follow.
-   */
-
-  /** No arg constructor. */
-  public TokenMgrError() {
-  }
-
-  /** Constructor with message and reason. */
-  public TokenMgrError(String message, int reason) {
-    super(message);
-    errorCode = reason;
-  }
-
-  /** Full Constructor. */
-  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
-    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-  }
-}
-/* JavaCC - OriginalChecksum=1d5a00954aca14e3d7e5c3895ade28cf (do not edit this line) */
diff --git a/strata/zookeeper/build/lib/commons-cli-1.2.jar b/strata/zookeeper/build/lib/commons-cli-1.2.jar
deleted file mode 100644
index ce4b9fff..00000000
--- a/strata/zookeeper/build/lib/commons-cli-1.2.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/jackson-core-asl-1.9.11.jar b/strata/zookeeper/build/lib/jackson-core-asl-1.9.11.jar
deleted file mode 100644
index 145fc489..00000000
--- a/strata/zookeeper/build/lib/jackson-core-asl-1.9.11.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/jackson-mapper-asl-1.9.11.jar b/strata/zookeeper/build/lib/jackson-mapper-asl-1.9.11.jar
deleted file mode 100644
index 3e686c6f..00000000
--- a/strata/zookeeper/build/lib/jackson-mapper-asl-1.9.11.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/javacc.jar b/strata/zookeeper/build/lib/javacc.jar
deleted file mode 100644
index 2550727e..00000000
--- a/strata/zookeeper/build/lib/javacc.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/jetty-6.1.26.jar b/strata/zookeeper/build/lib/jetty-6.1.26.jar
deleted file mode 100644
index 2cbe07ae..00000000
--- a/strata/zookeeper/build/lib/jetty-6.1.26.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/jetty-util-6.1.26.jar b/strata/zookeeper/build/lib/jetty-util-6.1.26.jar
deleted file mode 100644
index cd237528..00000000
--- a/strata/zookeeper/build/lib/jetty-util-6.1.26.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/jline-2.11.jar b/strata/zookeeper/build/lib/jline-2.11.jar
deleted file mode 100644
index 9604bd2f..00000000
--- a/strata/zookeeper/build/lib/jline-2.11.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/log4j-1.2.16.jar b/strata/zookeeper/build/lib/log4j-1.2.16.jar
deleted file mode 100644
index 5429a903..00000000
--- a/strata/zookeeper/build/lib/log4j-1.2.16.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/netty-3.7.0.Final.jar b/strata/zookeeper/build/lib/netty-3.7.0.Final.jar
deleted file mode 100644
index eef1abac..00000000
--- a/strata/zookeeper/build/lib/netty-3.7.0.Final.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/servlet-api-2.5-20081211.jar b/strata/zookeeper/build/lib/servlet-api-2.5-20081211.jar
deleted file mode 100644
index b0537c4d..00000000
--- a/strata/zookeeper/build/lib/servlet-api-2.5-20081211.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/slf4j-api-1.7.5.jar b/strata/zookeeper/build/lib/slf4j-api-1.7.5.jar
deleted file mode 100644
index 8f004d39..00000000
--- a/strata/zookeeper/build/lib/slf4j-api-1.7.5.jar
+++ /dev/null
diff --git a/strata/zookeeper/build/lib/slf4j-log4j12-1.7.5.jar b/strata/zookeeper/build/lib/slf4j-log4j12-1.7.5.jar
deleted file mode 100644
index f5298b5e..00000000
--- a/strata/zookeeper/build/lib/slf4j-log4j12-1.7.5.jar
+++ /dev/null
diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph
index 68736a3a..dbe6ccbb 100644
--- a/strata/zookeeper/zookeeper.morph
+++ b/strata/zookeeper/zookeeper.morph
@@ -1,6 +1,14 @@
 name: zookeeper
 kind: chunk
+configure-commands:
+  - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
 build-commands:
   - ant -p compile_jute
-  - cd src/c && autoreconf -i
-  - ./src/c/configure
+  - mkdir -p "$DESTDIR$PREFIX"/zookeeper
+  - cp -r * "$DESTDIR$PREFIX"/zookeeper
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
+  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c
+  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
+  - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg 
+  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
diff --git a/zookeeper.morph b/zookeeper.morph
index c53076a7..5278d0c1 100644
--- a/zookeeper.morph
+++ b/zookeeper.morph
@@ -5,7 +5,7 @@ systems:
     deploy:
       my-kvm-system:
         type: kvm
-        location: kvm+ssh://mikesmith@192.168.122.1/zookeeper/home/mikesmith/workspace/ct183/baserockImages/zookeper.img
+        location: kvm+ssh://mikesmith@10.24.2.123/zookeeper/home/mikesmith/workspace/ct183/baserockImages/zookeper.img
         DISK_SIZE: 4G
         RAM_SIZE: 2G
         VCPUS: 1
author	mike smith <mike.smith@codethink.co.uk>	2014-11-04 16:41:42 +0000
committer	mike smith <mike.smith@codethink.co.uk>	2014-11-04 16:41:42 +0000
commit	d0afa34549e85e42cbd4ac28d09e812bf6bcebc6 (patch)
tree	01ca2964f10d3da41400f44a5ef1b2af9a658618
parent	f831b6cce0952e3c1a781f436401c86079a73434 (diff)
download	definitions-d0afa34549e85e42cbd4ac28d09e812bf6bcebc6.tar.gz