[UIMA-5253] Auto-generate JCas classes for examples
- Removing JCas classes from repo
- Adding JCasGen Maven plugin to POM


git-svn-id: https://svn.apache.org/repos/asf/uima/uimafit/trunk@1778868 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/uimafit-examples/pom.xml b/uimafit-examples/pom.xml
index 72fd736..4c20035 100644
--- a/uimafit-examples/pom.xml
+++ b/uimafit-examples/pom.xml
@@ -57,7 +57,46 @@
 		</license>
 	</licenses>
 	<build>
-		<plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.uima</groupId>
+                <artifactId>jcasgen-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <typeSystemIncludes>
+                                <typeSystemInclude>src/main/resources/org/apache/uima/fit/examples/TypeSystem.xml</typeSystemInclude>
+                            </typeSystemIncludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!--
+                    This plug-in adds the jcasgen generated source code folder as a project
+                    source folder
+                -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/generated-sources/jcasgen</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java
deleted file mode 100644
index 65e413a..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:48:30 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class DateAnnotation extends DateTimeAnnotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(DateAnnotation.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected DateAnnotation() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public DateAnnotation(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public DateAnnotation(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public DateAnnotation(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation_Type.java
deleted file mode 100644
index 6cb8142..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation_Type.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:48:30 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class DateAnnotation_Type extends DateTimeAnnotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (DateAnnotation_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = DateAnnotation_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new DateAnnotation(addr, DateAnnotation_Type.this);
-          DateAnnotation_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new DateAnnotation(addr, DateAnnotation_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = DateAnnotation.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.DateAnnotation");
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public DateAnnotation_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java
deleted file mode 100644
index da2b318..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:46:36 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class DateTimeAnnotation extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(DateTimeAnnotation.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected DateTimeAnnotation() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public DateTimeAnnotation(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public DateTimeAnnotation(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public DateTimeAnnotation(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: shortDateString
-
-  /**
-   * getter for shortDateString - gets
-   * 
-   * @generated
-   */
-  public String getShortDateString() {
-    if (DateTimeAnnotation_Type.featOkTst
-            && ((DateTimeAnnotation_Type) jcasType).casFeat_shortDateString == null) {
-      jcasType.jcas.throwFeatMissing("shortDateString",
-              "org.apache.uima.fit.examples.tutorial.type.DateTimeAnnotation");
-    }
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((DateTimeAnnotation_Type) jcasType).casFeatCode_shortDateString);
-  }
-
-  /**
-   * setter for shortDateString - sets
-   * 
-   * @generated
-   */
-  public void setShortDateString(String v) {
-    if (DateTimeAnnotation_Type.featOkTst
-            && ((DateTimeAnnotation_Type) jcasType).casFeat_shortDateString == null) {
-      jcasType.jcas.throwFeatMissing("shortDateString",
-              "org.apache.uima.fit.examples.tutorial.type.DateTimeAnnotation");
-    }
-    jcasType.ll_cas.ll_setStringValue(addr,
-            ((DateTimeAnnotation_Type) jcasType).casFeatCode_shortDateString, v);
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation_Type.java
deleted file mode 100644
index ec31582..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation_Type.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:46:36 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class DateTimeAnnotation_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (DateTimeAnnotation_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = DateTimeAnnotation_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new DateTimeAnnotation(addr, DateTimeAnnotation_Type.this);
-          DateTimeAnnotation_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new DateTimeAnnotation(addr, DateTimeAnnotation_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = DateTimeAnnotation.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.DateTimeAnnotation");
-
-  /** @generated */
-  final Feature casFeat_shortDateString;
-
-  /** @generated */
-  final int casFeatCode_shortDateString;
-
-  /** @generated */
-  public String getShortDateString(int addr) {
-    if (featOkTst && casFeat_shortDateString == null) {
-      jcas.throwFeatMissing("shortDateString",
-              "org.apache.uima.fit.examples.tutorial.type.DateTimeAnnotation");
-    }
-    return ll_cas.ll_getStringValue(addr, casFeatCode_shortDateString);
-  }
-
-  /** @generated */
-  public void setShortDateString(int addr, String v) {
-    if (featOkTst && casFeat_shortDateString == null) {
-      jcas.throwFeatMissing("shortDateString",
-              "org.apache.uima.fit.examples.tutorial.type.DateTimeAnnotation");
-    }
-    ll_cas.ll_setStringValue(addr, casFeatCode_shortDateString, v);
-  }
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public DateTimeAnnotation_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-    casFeat_shortDateString = jcas.getRequiredFeatureDE(casType, "shortDateString",
-            "uima.cas.String", featOkTst);
-    casFeatCode_shortDateString = (null == casFeat_shortDateString) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_shortDateString).getCode();
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java
deleted file mode 100644
index bd1a241..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:50:10 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class Meeting extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(Meeting.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected Meeting() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public Meeting(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public Meeting(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public Meeting(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: room
-
-  /**
-   * getter for room - gets
-   * 
-   * @generated
-   */
-  public RoomNumber getRoom() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_room == null) {
-      jcasType.jcas.throwFeatMissing("room", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return (RoomNumber) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_room)));
-  }
-
-  /**
-   * setter for room - sets
-   * 
-   * @generated
-   */
-  public void setRoom(RoomNumber v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_room == null) {
-      jcasType.jcas.throwFeatMissing("room", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_room,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: date
-
-  /**
-   * getter for date - gets
-   * 
-   * @generated
-   */
-  public DateAnnotation getDate() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_date == null) {
-      jcasType.jcas.throwFeatMissing("date", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return (DateAnnotation) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_date)));
-  }
-
-  /**
-   * setter for date - sets
-   * 
-   * @generated
-   */
-  public void setDate(DateAnnotation v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_date == null) {
-      jcasType.jcas.throwFeatMissing("date", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_date,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: startTime
-
-  /**
-   * getter for startTime - gets
-   * 
-   * @generated
-   */
-  public TimeAnnotation getStartTime() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_startTime == null) {
-      jcasType.jcas.throwFeatMissing("startTime",
-              "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return (TimeAnnotation) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_startTime)));
-  }
-
-  /**
-   * setter for startTime - sets
-   * 
-   * @generated
-   */
-  public void setStartTime(TimeAnnotation v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_startTime == null) {
-      jcasType.jcas.throwFeatMissing("startTime",
-              "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_startTime,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: endTime
-
-  /**
-   * getter for endTime - gets
-   * 
-   * @generated
-   */
-  public TimeAnnotation getEndTime() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_endTime == null) {
-      jcasType.jcas.throwFeatMissing("endTime",
-              "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return (TimeAnnotation) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_endTime)));
-  }
-
-  /**
-   * setter for endTime - sets
-   * 
-   * @generated
-   */
-  public void setEndTime(TimeAnnotation v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_endTime == null) {
-      jcasType.jcas.throwFeatMissing("endTime",
-              "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_endTime,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting_Type.java
deleted file mode 100644
index dc23ee4..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting_Type.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:50:10 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class Meeting_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (Meeting_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = Meeting_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new Meeting(addr, Meeting_Type.this);
-          Meeting_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new Meeting(addr, Meeting_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = Meeting.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.Meeting");
-
-  /** @generated */
-  final Feature casFeat_room;
-
-  /** @generated */
-  final int casFeatCode_room;
-
-  /** @generated */
-  public int getRoom(int addr) {
-    if (featOkTst && casFeat_room == null) {
-      jcas.throwFeatMissing("room", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return ll_cas.ll_getRefValue(addr, casFeatCode_room);
-  }
-
-  /** @generated */
-  public void setRoom(int addr, int v) {
-    if (featOkTst && casFeat_room == null) {
-      jcas.throwFeatMissing("room", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    ll_cas.ll_setRefValue(addr, casFeatCode_room, v);
-  }
-
-  /** @generated */
-  final Feature casFeat_date;
-
-  /** @generated */
-  final int casFeatCode_date;
-
-  /** @generated */
-  public int getDate(int addr) {
-    if (featOkTst && casFeat_date == null) {
-      jcas.throwFeatMissing("date", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return ll_cas.ll_getRefValue(addr, casFeatCode_date);
-  }
-
-  /** @generated */
-  public void setDate(int addr, int v) {
-    if (featOkTst && casFeat_date == null) {
-      jcas.throwFeatMissing("date", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    ll_cas.ll_setRefValue(addr, casFeatCode_date, v);
-  }
-
-  /** @generated */
-  final Feature casFeat_startTime;
-
-  /** @generated */
-  final int casFeatCode_startTime;
-
-  /** @generated */
-  public int getStartTime(int addr) {
-    if (featOkTst && casFeat_startTime == null) {
-      jcas.throwFeatMissing("startTime", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return ll_cas.ll_getRefValue(addr, casFeatCode_startTime);
-  }
-
-  /** @generated */
-  public void setStartTime(int addr, int v) {
-    if (featOkTst && casFeat_startTime == null) {
-      jcas.throwFeatMissing("startTime", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    ll_cas.ll_setRefValue(addr, casFeatCode_startTime, v);
-  }
-
-  /** @generated */
-  final Feature casFeat_endTime;
-
-  /** @generated */
-  final int casFeatCode_endTime;
-
-  /** @generated */
-  public int getEndTime(int addr) {
-    if (featOkTst && casFeat_endTime == null) {
-      jcas.throwFeatMissing("endTime", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    return ll_cas.ll_getRefValue(addr, casFeatCode_endTime);
-  }
-
-  /** @generated */
-  public void setEndTime(int addr, int v) {
-    if (featOkTst && casFeat_endTime == null) {
-      jcas.throwFeatMissing("endTime", "org.apache.uima.fit.examples.tutorial.type.Meeting");
-    }
-    ll_cas.ll_setRefValue(addr, casFeatCode_endTime, v);
-  }
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public Meeting_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-    casFeat_room = jcas.getRequiredFeatureDE(casType, "room",
-            "org.apache.uima.fit.examples.tutorial.type.RoomNumber", featOkTst);
-    casFeatCode_room = (null == casFeat_room) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_room).getCode();
-
-    casFeat_date = jcas.getRequiredFeatureDE(casType, "date",
-            "org.apache.uima.fit.examples.tutorial.type.DateAnnotation", featOkTst);
-    casFeatCode_date = (null == casFeat_date) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_date).getCode();
-
-    casFeat_startTime = jcas.getRequiredFeatureDE(casType, "startTime",
-            "org.apache.uima.fit.examples.tutorial.type.TimeAnnotation", featOkTst);
-    casFeatCode_startTime = (null == casFeat_startTime) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_startTime).getCode();
-
-    casFeat_endTime = jcas.getRequiredFeatureDE(casType, "endTime",
-            "org.apache.uima.fit.examples.tutorial.type.TimeAnnotation", featOkTst);
-    casFeatCode_endTime = (null == casFeat_endTime) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_endTime).getCode();
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java
deleted file mode 100644
index dbccacd..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Mon Mar 29 06:42:24 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class RoomNumber extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(RoomNumber.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected RoomNumber() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public RoomNumber(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public RoomNumber(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public RoomNumber(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: building
-
-  /**
-   * getter for building - gets
-   * 
-   * @generated
-   */
-  public String getBuilding() {
-    if (RoomNumber_Type.featOkTst && ((RoomNumber_Type) jcasType).casFeat_building == null) {
-      jcasType.jcas.throwFeatMissing("building",
-              "org.apache.uima.fit.examples.tutorial.type.RoomNumber");
-    }
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((RoomNumber_Type) jcasType).casFeatCode_building);
-  }
-
-  /**
-   * setter for building - sets
-   * 
-   * @generated
-   */
-  public void setBuilding(String v) {
-    if (RoomNumber_Type.featOkTst && ((RoomNumber_Type) jcasType).casFeat_building == null) {
-      jcasType.jcas.throwFeatMissing("building",
-              "org.apache.uima.fit.examples.tutorial.type.RoomNumber");
-    }
-    jcasType.ll_cas.ll_setStringValue(addr, ((RoomNumber_Type) jcasType).casFeatCode_building, v);
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber_Type.java
deleted file mode 100644
index 56f951b..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber_Type.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Mon Mar 29 06:42:24 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class RoomNumber_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (RoomNumber_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = RoomNumber_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new RoomNumber(addr, RoomNumber_Type.this);
-          RoomNumber_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new RoomNumber(addr, RoomNumber_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = RoomNumber.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.RoomNumber");
-
-  /** @generated */
-  final Feature casFeat_building;
-
-  /** @generated */
-  final int casFeatCode_building;
-
-  /** @generated */
-  public String getBuilding(int addr) {
-    if (featOkTst && casFeat_building == null) {
-      jcas.throwFeatMissing("building", "org.apache.uima.fit.examples.tutorial.type.RoomNumber");
-    }
-    return ll_cas.ll_getStringValue(addr, casFeatCode_building);
-  }
-
-  /** @generated */
-  public void setBuilding(int addr, String v) {
-    if (featOkTst && casFeat_building == null) {
-      jcas.throwFeatMissing("building", "org.apache.uima.fit.examples.tutorial.type.RoomNumber");
-    }
-    ll_cas.ll_setStringValue(addr, casFeatCode_building, v);
-  }
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public RoomNumber_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-    casFeat_building = jcas.getRequiredFeatureDE(casType, "building", "uima.cas.String", featOkTst);
-    casFeatCode_building = (null == casFeat_building) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_building).getCode();
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java
deleted file mode 100644
index fa0ef0c..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:47:21 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class TimeAnnotation extends DateTimeAnnotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(TimeAnnotation.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected TimeAnnotation() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public TimeAnnotation(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public TimeAnnotation(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public TimeAnnotation(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation_Type.java
deleted file mode 100644
index 86b443e..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation_Type.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:47:21 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class TimeAnnotation_Type extends DateTimeAnnotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (TimeAnnotation_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = TimeAnnotation_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new TimeAnnotation(addr, TimeAnnotation_Type.this);
-          TimeAnnotation_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new TimeAnnotation(addr, TimeAnnotation_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = TimeAnnotation.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.TimeAnnotation");
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public TimeAnnotation_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java
deleted file mode 100644
index 1d6e231..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:36:38 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class UimaAcronym extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(UimaAcronym.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected UimaAcronym() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public UimaAcronym(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaAcronym(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaAcronym(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: expandedForm
-
-  /**
-   * getter for expandedForm - gets
-   * 
-   * @generated
-   */
-  public String getExpandedForm() {
-    if (UimaAcronym_Type.featOkTst && ((UimaAcronym_Type) jcasType).casFeat_expandedForm == null) {
-      jcasType.jcas.throwFeatMissing("expandedForm",
-              "org.apache.uima.fit.examples.tutorial.type.UimaAcronym");
-    }
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((UimaAcronym_Type) jcasType).casFeatCode_expandedForm);
-  }
-
-  /**
-   * setter for expandedForm - sets
-   * 
-   * @generated
-   */
-  public void setExpandedForm(String v) {
-    if (UimaAcronym_Type.featOkTst && ((UimaAcronym_Type) jcasType).casFeat_expandedForm == null) {
-      jcasType.jcas.throwFeatMissing("expandedForm",
-              "org.apache.uima.fit.examples.tutorial.type.UimaAcronym");
-    }
-    jcasType.ll_cas.ll_setStringValue(addr, ((UimaAcronym_Type) jcasType).casFeatCode_expandedForm,
-            v);
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym_Type.java
deleted file mode 100644
index b5e2add..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym_Type.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:36:39 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class UimaAcronym_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (UimaAcronym_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = UimaAcronym_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new UimaAcronym(addr, UimaAcronym_Type.this);
-          UimaAcronym_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new UimaAcronym(addr, UimaAcronym_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = UimaAcronym.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.UimaAcronym");
-
-  /** @generated */
-  final Feature casFeat_expandedForm;
-
-  /** @generated */
-  final int casFeatCode_expandedForm;
-
-  /** @generated */
-  public String getExpandedForm(int addr) {
-    if (featOkTst && casFeat_expandedForm == null) {
-      jcas.throwFeatMissing("expandedForm",
-              "org.apache.uima.fit.examples.tutorial.type.UimaAcronym");
-    }
-    return ll_cas.ll_getStringValue(addr, casFeatCode_expandedForm);
-  }
-
-  /** @generated */
-  public void setExpandedForm(int addr, String v) {
-    if (featOkTst && casFeat_expandedForm == null) {
-      jcas.throwFeatMissing("expandedForm",
-              "org.apache.uima.fit.examples.tutorial.type.UimaAcronym");
-    }
-    ll_cas.ll_setStringValue(addr, casFeatCode_expandedForm, v);
-  }
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public UimaAcronym_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-    casFeat_expandedForm = jcas.getRequiredFeatureDE(casType, "expandedForm", "uima.cas.String",
-            featOkTst);
-    casFeatCode_expandedForm = (null == casFeat_expandedForm) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_expandedForm).getCode();
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java
deleted file mode 100644
index d6053eb..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:55:38 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class UimaMeeting extends Meeting {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(UimaMeeting.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected UimaMeeting() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public UimaMeeting(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaMeeting(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaMeeting(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting_Type.java
deleted file mode 100644
index 8487d45..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting_Type.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Fri Apr 02 09:55:38 MDT 2010 */
-package org.apache.uima.fit.examples.tutorial.type;
-
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-
-/**
- * Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010
- * 
- * @generated
- */
-public class UimaMeeting_Type extends Meeting_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (UimaMeeting_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = UimaMeeting_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new UimaMeeting(addr, UimaMeeting_Type.this);
-          UimaMeeting_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new UimaMeeting(addr, UimaMeeting_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = UimaMeeting.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.tutorial.type.UimaMeeting");
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public UimaMeeting_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java
deleted file mode 100644
index b68c246..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Wed Jul 14 10:08:01 MDT 2010 */
-package org.apache.uima.fit.examples.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimafit-parent/uimaFIT-examples/src
- * /main/resources/org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class Sentence extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(Sentence.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected Sentence() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public Sentence(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public Sentence(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public Sentence(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java
deleted file mode 100644
index 034b6f0..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Wed Jul 14 10:08:01 MDT 2010 */
-package org.apache.uima.fit.examples.type;
-
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010
- * 
- * @generated
- */
-public class Sentence_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (Sentence_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = Sentence_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new Sentence(addr, Sentence_Type.this);
-          Sentence_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new Sentence(addr, Sentence_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = Sentence.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.type.Sentence");
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public Sentence_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java
deleted file mode 100644
index 7a9bb4e..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Wed Jul 14 10:08:01 MDT 2010 */
-package org.apache.uima.fit.examples.type;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
-
-/**
- * Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimafit-parent/uimaFIT-examples/src
- * /main/resources/org/apache/uima/fit/examples/TypeSystem.xml
- * 
- * @generated
- */
-public class Token extends Annotation {
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int typeIndexID = JCasRegistry.register(Token.class);
-
-  /**
-   * @generated
-   * @ordered
-   */
-  public final static int type = typeIndexID;
-
-  /** @generated */
-  @Override
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
-   */
-  protected Token() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
-   * @generated
-   */
-  public Token(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public Token(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  /** @generated */
-  public Token(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: pos
-
-  /**
-   * getter for pos - gets
-   * 
-   * @generated
-   */
-  public String getPos() {
-    if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_pos == null) {
-      jcasType.jcas.throwFeatMissing("pos", "org.apache.uima.fit.examples.type.Token");
-    }
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Token_Type) jcasType).casFeatCode_pos);
-  }
-
-  /**
-   * setter for pos - sets
-   * 
-   * @generated
-   */
-  public void setPos(String v) {
-    if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_pos == null) {
-      jcasType.jcas.throwFeatMissing("pos", "org.apache.uima.fit.examples.type.Token");
-    }
-    jcasType.ll_cas.ll_setStringValue(addr, ((Token_Type) jcasType).casFeatCode_pos, v);
-  }
-}
diff --git a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token_Type.java b/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token_Type.java
deleted file mode 100644
index 21f48e0..0000000
--- a/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token_Type.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/* 
- * 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.
- */
-/* First created by JCasGen Wed Jul 14 10:08:01 MDT 2010 */
-package org.apache.uima.fit.examples.type;
-
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/**
- * Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010
- * 
- * @generated
- */
-public class Token_Type extends Annotation_Type {
-  /** @generated */
-  @Override
-  protected FSGenerator getFSGenerator() {
-    return fsGenerator;
-  }
-
-  /** @generated */
-  private final FSGenerator fsGenerator = new FSGenerator() {
-    public FeatureStructure createFS(int addr, CASImpl cas) {
-      if (Token_Type.this.useExistingInstance) {
-        // Return eq fs instance if already created
-        FeatureStructure fs = Token_Type.this.jcas.getJfsFromCaddr(addr);
-        if (null == fs) {
-          fs = new Token(addr, Token_Type.this);
-          Token_Type.this.jcas.putJfsFromCaddr(addr, fs);
-          return fs;
-        }
-        return fs;
-      } else {
-        return new Token(addr, Token_Type.this);
-      }
-    }
-  };
-
-  /** @generated */
-  public final static int typeIndexID = Token.typeIndexID;
-
-  /**
-   * @generated
-   * @modifiable
-   */
-  public final static boolean featOkTst = JCasRegistry
-          .getFeatOkTst("org.apache.uima.fit.examples.type.Token");
-
-  /** @generated */
-  final Feature casFeat_pos;
-
-  /** @generated */
-  final int casFeatCode_pos;
-
-  /** @generated */
-  public String getPos(int addr) {
-    if (featOkTst && casFeat_pos == null) {
-      jcas.throwFeatMissing("pos", "org.apache.uima.fit.examples.type.Token");
-    }
-    return ll_cas.ll_getStringValue(addr, casFeatCode_pos);
-  }
-
-  /** @generated */
-  public void setPos(int addr, String v) {
-    if (featOkTst && casFeat_pos == null) {
-      jcas.throwFeatMissing("pos", "org.apache.uima.fit.examples.type.Token");
-    }
-    ll_cas.ll_setStringValue(addr, casFeatCode_pos, v);
-  }
-
-  /**
-   * initialize variables to correspond with Cas Type and Features
-   * 
-   * @generated
-   */
-  public Token_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, getFSGenerator());
-
-    casFeat_pos = jcas.getRequiredFeatureDE(casType, "pos", "uima.cas.String", featOkTst);
-    casFeatCode_pos = (null == casFeat_pos) ? JCas.INVALID_FEATURE_CODE
-            : ((FeatureImpl) casFeat_pos).getCode();
-
-  }
-}