You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2015/11/04 15:38:50 UTC

svn commit: r1712555 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java: aa/ org/apache/uima/cas/test/ org/apache/uima/jcas/test/

Author: schor
Date: Wed Nov  4 14:38:50 2015
New Revision: 1712555

URL: http://svn.apache.org/viewvc?rev=1712555&view=rev
Log:
[UIMA-4666] new versions of generated JCas for v3 testing

Removed:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root_Type.java
Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java Wed Nov  4 14:38:50 2015
@@ -1,107 +1,99 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 16:59:32 EST 2015 */
 
 package aa;
 
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+
 import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.jcas.cas.TOP_Type;
 
-/**
- * Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
- * C:/a/Eclipse/3.1/j4/jedii_jcas_tests/testTypes.xml
- * 
- * @generated
- */
+
+/** 
+ * Updated by JCasGen Tue Nov 03 16:59:32 EST 2015
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
 public class AbstractType extends TOP {
-  /**
-   * @generated
-   * @ordered
+  /** @generated
+   * @ordered 
    */
-  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(AbstractType.class);
-
-  /**
-   * @generated
-   * @ordered
+  @SuppressWarnings ("hiding")
+  public final static int typeIndexID = JCasRegistry.register(AbstractType.class);
+  /** @generated
+   * @ordered 
    */
+  @SuppressWarnings ("hiding")
   public final static int type = typeIndexID;
-
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
+  /** @generated
+   * @return index of the type  
    */
-  protected AbstractType() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
+  @Override
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+ 
+  /* *****************
+   *    Local Data   *
+   * *****************/ 
+   
+  /* Register Features */
+  private final static int _FI_abstractInt = JCasRegistry.registerFeature();
+
+   
+  private int _F_abstractInt;  // 
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected AbstractType() {/* intentionally empty block */}
+    
+  /** Internal - constructor used by generator 
    * @generated
+   * @param casImpl the CAS this Feature Structure belongs to
+   * @param type the type of this Feature Structure 
    */
-  public AbstractType(int addr, TOP_Type type) {
-    super(addr, type);
+  public AbstractType(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-
-  /** @generated */
+  
+  /** @generated
+   * @param jcas JCas to which this Feature Structure belongs 
+   */
   public AbstractType(JCas jcas) {
     super(jcas);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
+    readObject();   
+  } 
 
-  // *--------------*
-  // * Feature: abstractInt
-
-  /**
-   * getter for abstractInt - gets
-   * 
-   * @generated
-   */
-  public int getAbstractInt() {
-    if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
-      this.jcasType.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
-    return jcasType.ll_cas.ll_getIntValue(addr,
-            ((AbstractType_Type) jcasType).casFeatCode_abstractInt);
-  }
-
-  /**
-   * setter for abstractInt - sets
-   * 
+  /** 
+   * <!-- begin-user-doc -->
+   * Write your own initialization here
+   * <!-- end-user-doc -->
+   *
+   * @generated modifiable 
+   */
+  private void readObject() {/*default - does nothing empty block */}
+     
+ 
+    
+  //*--------------*
+  //* Feature: abstractInt
+
+  /** getter for abstractInt - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public int getAbstractInt() { return _F_abstractInt;}
+    
+  /** setter for abstractInt - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setAbstractInt(int v) {
-    if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
-      this.jcasType.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
-    jcasType.ll_cas.ll_setIntValue(addr, ((AbstractType_Type) jcasType).casFeatCode_abstractInt, v);
+              _casView.setWithCheckAndJournalJFRI(this, _FI_abstractInt, () -> _F_abstractInt = v);
+      }    
   }
-}
+
+    
\ No newline at end of file

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java Wed Nov  4 14:38:50 2015
@@ -1,109 +1,98 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 16:59:32 EST 2015 */
 
 package aa;
 
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.cas.TOP_Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+
+
 
-/**
- * Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
- * C:/a/Eclipse/3.1/j4/jedii_jcas_tests/testTypes.xml
- * 
- * @generated
- */
+/** 
+ * Updated by JCasGen Tue Nov 03 16:59:32 EST 2015
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
 public class ConcreteType extends AbstractType {
-  /**
-   * @generated
-   * @ordered
+  /** @generated
+   * @ordered 
    */
-  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(ConcreteType.class);
-
-  /**
-   * @generated
-   * @ordered
+  @SuppressWarnings ("hiding")
+  public final static int typeIndexID = JCasRegistry.register(ConcreteType.class);
+  /** @generated
+   * @ordered 
    */
+  @SuppressWarnings ("hiding")
   public final static int type = typeIndexID;
-
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
+  /** @generated
+   * @return index of the type  
    */
-  protected ConcreteType() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
+  @Override
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+ 
+  /* *****************
+   *    Local Data   *
+   * *****************/ 
+   
+  /* Register Features */
+  private final static int _FI_concreteString = JCasRegistry.registerFeature();
+
+   
+  private String _F_concreteString;  // 
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected ConcreteType() {/* intentionally empty block */}
+    
+  /** Internal - constructor used by generator 
    * @generated
+   * @param casImpl the CAS this Feature Structure belongs to
+   * @param type the type of this Feature Structure 
    */
-  public ConcreteType(int addr, TOP_Type type) {
-    super(addr, type);
+  public ConcreteType(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-
-  /** @generated */
+  
+  /** @generated
+   * @param jcas JCas to which this Feature Structure belongs 
+   */
   public ConcreteType(JCas jcas) {
     super(jcas);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
+    readObject();   
+  } 
 
-  // *--------------*
-  // * Feature: concreteString
-
-  /**
-   * getter for concreteString - gets
-   * 
-   * @generated
-   */
-  public String getConcreteString() {
-    if (ConcreteType_Type.featOkTst
-            && ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
-      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((ConcreteType_Type) jcasType).casFeatCode_concreteString);
-  }
-
-  /**
-   * setter for concreteString - sets
-   * 
+  /** 
+   * <!-- begin-user-doc -->
+   * Write your own initialization here
+   * <!-- end-user-doc -->
+   *
+   * @generated modifiable 
+   */
+  private void readObject() {/*default - does nothing empty block */}
+     
+ 
+    
+  //*--------------*
+  //* Feature: concreteString
+
+  /** getter for concreteString - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public String getConcreteString() { return _F_concreteString;}
+    
+  /** setter for concreteString - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setConcreteString(String v) {
-    if (ConcreteType_Type.featOkTst
-            && ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
-      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
-    jcasType.ll_cas.ll_setStringValue(addr,
-            ((ConcreteType_Type) jcasType).casFeatCode_concreteString, v);
+              _casView.setWithCheckAndJournalJFRI(this, _FI_concreteString, () -> _F_concreteString = v);
+      }    
   }
-}
+
+    
\ No newline at end of file

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java Wed Nov  4 14:38:50 2015
@@ -1,168 +1,139 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 16:59:32 EST 2015 */
 
 package aa;
 
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+
 import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.jcas.cas.TOP_Type;
 
-/**
- * Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
- * C:/a/Eclipse/3.1/j4/jedii_jcas_tests/testTypes.xml
- * 
- * @generated
- */
+
+/** 
+ * Updated by JCasGen Tue Nov 03 16:59:32 EST 2015
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
 public class MissingFeatureInCas extends TOP {
-  /**
-   * @generated
-   * @ordered
+  /** @generated
+   * @ordered 
    */
-  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(MissingFeatureInCas.class);
-
-  /**
-   * @generated
-   * @ordered
+  @SuppressWarnings ("hiding")
+  public final static int typeIndexID = JCasRegistry.register(MissingFeatureInCas.class);
+  /** @generated
+   * @ordered 
    */
+  @SuppressWarnings ("hiding")
   public final static int type = typeIndexID;
-
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
+  /** @generated
+   * @return index of the type  
    */
-  protected MissingFeatureInCas() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
+  @Override
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+ 
+  /* *****************
+   *    Local Data   *
+   * *****************/ 
+   
+  /* Register Features */
+  private final static int _FI_haveThisOne = JCasRegistry.registerFeature();
+  private final static int _FI_missingThisOne = JCasRegistry.registerFeature();
+  private final static int _FI_changedFType = JCasRegistry.registerFeature();
+
+   
+  private int _F_haveThisOne;  // 
+  private float _F_missingThisOne;  // 
+  private String _F_changedFType;  // 
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected MissingFeatureInCas() {/* intentionally empty block */}
+    
+  /** Internal - constructor used by generator 
    * @generated
+   * @param casImpl the CAS this Feature Structure belongs to
+   * @param type the type of this Feature Structure 
    */
-  public MissingFeatureInCas(int addr, TOP_Type type) {
-    super(addr, type);
+  public MissingFeatureInCas(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-
-  /** @generated */
+  
+  /** @generated
+   * @param jcas JCas to which this Feature Structure belongs 
+   */
   public MissingFeatureInCas(JCas jcas) {
     super(jcas);
-    readObject();
-  }
-
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
+    readObject();   
+  } 
 
-  // *--------------*
-  // * Feature: haveThisOne
-
-  /**
-   * getter for haveThisOne - gets
-   * 
-   * @generated
-   */
-  public int getHaveThisOne() {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
-      this.jcasType.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
-    return jcasType.ll_cas.ll_getIntValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne);
-  }
-
-  /**
-   * setter for haveThisOne - sets
-   * 
+  /** 
+   * <!-- begin-user-doc -->
+   * Write your own initialization here
+   * <!-- end-user-doc -->
+   *
+   * @generated modifiable 
+   */
+  private void readObject() {/*default - does nothing empty block */}
+     
+ 
+    
+  //*--------------*
+  //* Feature: haveThisOne
+
+  /** getter for haveThisOne - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public int getHaveThisOne() { return _F_haveThisOne;}
+    
+  /** setter for haveThisOne - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setHaveThisOne(int v) {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
-      this.jcasType.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
-    jcasType.ll_cas.ll_setIntValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne, v);
-  }
-
-  // *--------------*
-  // * Feature: missingThisOne
-
-  /**
-   * getter for missingThisOne - gets
-   * 
-   * @generated
-   */
-  public float getMissingThisOne() {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
-      this.jcasType.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
-    return jcasType.ll_cas.ll_getFloatValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne);
-  }
-
-  /**
-   * setter for missingThisOne - sets
-   * 
+              _casView.setWithCheckAndJournalJFRI(this, _FI_haveThisOne, () -> _F_haveThisOne = v);
+      }    
+   
+    
+  //*--------------*
+  //* Feature: missingThisOne
+
+  /** getter for missingThisOne - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public float getMissingThisOne() { return _F_missingThisOne;}
+    
+  /** setter for missingThisOne - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setMissingThisOne(float v) {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
-      this.jcasType.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
-    jcasType.ll_cas.ll_setFloatValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne, v);
-  }
-
-  // *--------------*
-  // * Feature: changedFType
-
-  /**
-   * getter for changedFType - gets
-   * 
-   * @generated
-   */
-  public String getChangedFType() {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
-      this.jcasType.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_changedFType);
-  }
-
-  /**
-   * setter for changedFType - sets
-   * 
+              _casView.setWithCheckAndJournalJFRI(this, _FI_missingThisOne, () -> _F_missingThisOne = v);
+      }    
+   
+    
+  //*--------------*
+  //* Feature: changedFType
+
+  /** getter for changedFType - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public String getChangedFType() { return _F_changedFType;}
+    
+  /** setter for changedFType - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setChangedFType(String v) {
-    if (MissingFeatureInCas_Type.featOkTst
-            && ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
-      this.jcasType.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
-    jcasType.ll_cas.ll_setStringValue(addr,
-            ((MissingFeatureInCas_Type) jcasType).casFeatCode_changedFType, v);
+              _casView.setWithCheckAndJournalJFRI(this, _FI_changedFType, () -> _F_changedFType = v);
+      }    
   }
-}
+
+    
\ No newline at end of file

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java Wed Nov  4 14:38:50 2015
@@ -1,82 +1,79 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 16:59:32 EST 2015 */
 
 package aa;
 
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+
 import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.jcas.cas.TOP_Type;
 
-/**
- * Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
- * C:/a/Eclipse/3.1/j4/jedii_jcas_tests/testTypes.xml
- * 
- * @generated
- */
+
+/** 
+ * Updated by JCasGen Tue Nov 03 16:59:32 EST 2015
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
 public class MissingInCas extends TOP {
-  /**
-   * @generated
-   * @ordered
+  /** @generated
+   * @ordered 
    */
-  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(MissingInCas.class);
-
-  /**
-   * @generated
-   * @ordered
+  @SuppressWarnings ("hiding")
+  public final static int typeIndexID = JCasRegistry.register(MissingInCas.class);
+  /** @generated
+   * @ordered 
    */
+  @SuppressWarnings ("hiding")
   public final static int type = typeIndexID;
-
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
+  /** @generated
+   * @return index of the type  
    */
-  protected MissingInCas() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
+  @Override
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+ 
+  /* *****************
+   *    Local Data   *
+   * *****************/ 
+   
+  /* Register Features */
+
+   
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected MissingInCas() {/* intentionally empty block */}
+    
+  /** Internal - constructor used by generator 
    * @generated
+   * @param casImpl the CAS this Feature Structure belongs to
+   * @param type the type of this Feature Structure 
    */
-  public MissingInCas(int addr, TOP_Type type) {
-    super(addr, type);
+  public MissingInCas(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-
-  /** @generated */
+  
+  /** @generated
+   * @param jcas JCas to which this Feature Structure belongs 
+   */
   public MissingInCas(JCas jcas) {
     super(jcas);
-    readObject();
-  }
+    readObject();   
+  } 
 
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
+  /** 
+   * <!-- begin-user-doc -->
+   * Write your own initialization here
+   * <!-- end-user-doc -->
+   *
+   * @generated modifiable 
    */
-  private void readObject() {
-  }
-
+  private void readObject() {/*default - does nothing empty block */}
+     
 }
+
+    
\ No newline at end of file

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java Wed Nov  4 14:38:50 2015
@@ -1,433 +1,312 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 16:59:33 EST 2015 */
 
 package aa;
 
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+
 import org.apache.uima.jcas.cas.FSArray;
 import org.apache.uima.jcas.cas.FloatArray;
-import org.apache.uima.jcas.cas.IntegerArray;
-import org.apache.uima.jcas.cas.StringArray;
 import org.apache.uima.jcas.cas.TOP;
-import org.apache.uima.jcas.cas.TOP_Type;
+import org.apache.uima.jcas.cas.StringArray;
+import org.apache.uima.jcas.cas.IntegerArray;
+
 
-/**
- * Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
- * C:/a/Eclipse/3.1/j4/jedii_jcas_tests/testTypes.xml
- * 
- * @generated
- */
+/** 
+ * Updated by JCasGen Tue Nov 03 16:59:33 EST 2015
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
 public class Root extends TOP {
-  /**
-   * @generated
-   * @ordered
+  /** @generated
+   * @ordered 
    */
-  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Root.class);
-
-  /**
-   * @generated
-   * @ordered
+  @SuppressWarnings ("hiding")
+  public final static int typeIndexID = JCasRegistry.register(Root.class);
+  /** @generated
+   * @ordered 
    */
+  @SuppressWarnings ("hiding")
   public final static int type = typeIndexID;
-
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  /**
-   * Never called. Disable default constructor
-   * 
-   * @generated
+  /** @generated
+   * @return index of the type  
    */
-  protected Root() {
-  }
-
-  /**
-   * Internal - constructor used by generator
-   * 
+  @Override
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+ 
+  /* *****************
+   *    Local Data   *
+   * *****************/ 
+   
+  /* Register Features */
+  private final static int _FI_arrayInt = JCasRegistry.registerFeature();
+  private final static int _FI_arrayRef = JCasRegistry.registerFeature();
+  private final static int _FI_arrayFloat = JCasRegistry.registerFeature();
+  private final static int _FI_arrayString = JCasRegistry.registerFeature();
+  private final static int _FI_plainInt = JCasRegistry.registerFeature();
+  private final static int _FI_plainFloat = JCasRegistry.registerFeature();
+  private final static int _FI_plainString = JCasRegistry.registerFeature();
+  private final static int _FI_plainRef = JCasRegistry.registerFeature();
+
+   
+  private IntegerArray _F_arrayInt;  // 
+  private FSArray _F_arrayRef;  // 
+  private FloatArray _F_arrayFloat;  // 
+  private StringArray _F_arrayString;  // 
+  private int _F_plainInt;  // 
+  private float _F_plainFloat;  // 
+  private String _F_plainString;  // 
+  private Root _F_plainRef;  // TokenType testMissingImport;
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Root() {/* intentionally empty block */}
+    
+  /** Internal - constructor used by generator 
    * @generated
+   * @param casImpl the CAS this Feature Structure belongs to
+   * @param type the type of this Feature Structure 
    */
-  public Root(int addr, TOP_Type type) {
-    super(addr, type);
+  public Root(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-
-  /** @generated */
+  
+  /** @generated
+   * @param jcas JCas to which this Feature Structure belongs 
+   */
   public Root(JCas jcas) {
     super(jcas);
-    readObject();
-  }
+    readObject();   
+  } 
 
-  /**
-   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
-   * @generated modifiable
-   */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: arrayInt
-
-  /**
-   * getter for arrayInt - gets
-   * 
-   * @generated
-   */
-  public IntegerArray getArrayInt() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
-    return (IntegerArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayInt)));
-  }
-
-  /**
-   * setter for arrayInt - sets
-   * 
+  /** 
+   * <!-- begin-user-doc -->
+   * Write your own initialization here
+   * <!-- end-user-doc -->
+   *
+   * @generated modifiable 
+   */
+  private void readObject() {/*default - does nothing empty block */}
+     
+ 
+    
+  //*--------------*
+  //* Feature: arrayInt
+
+  /** getter for arrayInt - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public IntegerArray getArrayInt() { return _F_arrayInt;}
+    
+  /** setter for arrayInt - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setArrayInt(IntegerArray v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayInt,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  /**
-   * indexed getter for arrayInt - gets an indexed value -
-   * 
+         
+      _casView.setWithJournalJFRI(this, _FI_arrayInt, () -> _F_arrayInt = v);
+      }    
+    
+  /** indexed getter for arrayInt - gets an indexed value - 
    * @generated
+   * @param i index in the array to get
+   * @return value of the element at index i 
    */
   public int getArrayInt(int i) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayInt), i);
-    return jcasType.ll_cas.ll_getIntArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayInt), i);
-  }
+     return getArrayInt().get(i);} 
 
-  /**
-   * indexed setter for arrayInt - sets an indexed value -
-   * 
+  /** indexed setter for arrayInt - sets an indexed value - 
    * @generated
+   * @param i index in the array to set
+   * @param v value to set into the array 
    */
   public void setArrayInt(int i, int v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayInt), i);
-    jcasType.ll_cas.ll_setIntArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayInt), i, v);
-  }
+    getArrayInt().set(i, v);}  
+   
+    
+  //*--------------*
+  //* Feature: arrayRef
 
-  // *--------------*
-  // * Feature: arrayRef
-
-  /**
-   * getter for arrayRef - gets
-   * 
+  /** getter for arrayRef - gets 
    * @generated
+   * @return value of the feature 
    */
-  public FSArray getArrayRef() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
-    return (FSArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayRef)));
-  }
-
-  /**
-   * setter for arrayRef - sets
-   * 
+  public FSArray getArrayRef() { return _F_arrayRef;}
+    
+  /** setter for arrayRef - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setArrayRef(FSArray v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayRef,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  /**
-   * indexed getter for arrayRef - gets an indexed value -
-   * 
+         
+      _casView.setWithJournalJFRI(this, _FI_arrayRef, () -> _F_arrayRef = v);
+      }    
+    
+  /** indexed getter for arrayRef - gets an indexed value - 
    * @generated
+   * @param i index in the array to get
+   * @return value of the element at index i 
    */
   public TOP getArrayRef(int i) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayRef), i);
-    return (TOP) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(
-            jcasType.ll_cas.ll_getRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayRef), i)));
-  }
+     return getArrayRef().get(i);} 
 
-  /**
-   * indexed setter for arrayRef - sets an indexed value -
-   * 
+  /** indexed setter for arrayRef - sets an indexed value - 
    * @generated
+   * @param i index in the array to set
+   * @param v value to set into the array 
    */
   public void setArrayRef(int i, TOP v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayRef), i);
-    jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayRef), i, jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: arrayFloat
+    getArrayRef().set(i, v);}  
+   
+    
+  //*--------------*
+  //* Feature: arrayFloat
 
-  /**
-   * getter for arrayFloat - gets
-   * 
+  /** getter for arrayFloat - gets 
    * @generated
+   * @return value of the feature 
    */
-  public FloatArray getArrayFloat() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
-    return (FloatArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayFloat)));
-  }
-
-  /**
-   * setter for arrayFloat - sets
-   * 
+  public FloatArray getArrayFloat() { return _F_arrayFloat;}
+    
+  /** setter for arrayFloat - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setArrayFloat(FloatArray v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayFloat,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  /**
-   * indexed getter for arrayFloat - gets an indexed value -
-   * 
+         
+      _casView.setWithJournalJFRI(this, _FI_arrayFloat, () -> _F_arrayFloat = v);
+      }    
+    
+  /** indexed getter for arrayFloat - gets an indexed value - 
    * @generated
+   * @param i index in the array to get
+   * @return value of the element at index i 
    */
   public float getArrayFloat(int i) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayFloat), i);
-    return jcasType.ll_cas.ll_getFloatArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayFloat), i);
-  }
+     return getArrayFloat().get(i);} 
 
-  /**
-   * indexed setter for arrayFloat - sets an indexed value -
-   * 
+  /** indexed setter for arrayFloat - sets an indexed value - 
    * @generated
+   * @param i index in the array to set
+   * @param v value to set into the array 
    */
   public void setArrayFloat(int i, float v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayFloat), i);
-    jcasType.ll_cas.ll_setFloatArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayFloat), i, v);
-  }
-
-  // *--------------*
-  // * Feature: arrayString
+    getArrayFloat().set(i, v);}  
+   
+    
+  //*--------------*
+  //* Feature: arrayString
 
-  /**
-   * getter for arrayString - gets
-   * 
+  /** getter for arrayString - gets 
    * @generated
+   * @return value of the feature 
    */
-  public StringArray getArrayString() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
-    return (StringArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayString)));
-  }
-
-  /**
-   * setter for arrayString - sets
-   * 
+  public StringArray getArrayString() { return _F_arrayString;}
+    
+  /** setter for arrayString - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setArrayString(StringArray v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayString,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  /**
-   * indexed getter for arrayString - gets an indexed value -
-   * 
+         
+      _casView.setWithJournalJFRI(this, _FI_arrayString, () -> _F_arrayString = v);
+      }    
+    
+  /** indexed getter for arrayString - gets an indexed value - 
    * @generated
+   * @param i index in the array to get
+   * @return value of the element at index i 
    */
   public String getArrayString(int i) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayString), i);
-    return jcasType.ll_cas.ll_getStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayString), i);
-  }
+     return getArrayString().get(i);} 
 
-  /**
-   * indexed setter for arrayString - sets an indexed value -
-   * 
+  /** indexed setter for arrayString - sets an indexed value - 
    * @generated
+   * @param i index in the array to set
+   * @param v value to set into the array 
    */
   public void setArrayString(int i, String v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayString), i);
-    jcasType.ll_cas.ll_setStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_arrayString), i, v);
-  }
+    getArrayString().set(i, v);}  
+   
+    
+  //*--------------*
+  //* Feature: plainInt
 
-  // *--------------*
-  // * Feature: plainInt
-
-  /**
-   * getter for plainInt - gets
-   * 
+  /** getter for plainInt - gets 
    * @generated
+   * @return value of the feature 
    */
-  public int getPlainInt() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainInt == null)
-      this.jcasType.jcas.throwFeatMissing("plainInt", "aa.Root");
-    return jcasType.ll_cas.ll_getIntValue(addr, ((Root_Type) jcasType).casFeatCode_plainInt);
-  }
-
-  /**
-   * setter for plainInt - sets
-   * 
+  public int getPlainInt() { return _F_plainInt;}
+    
+  /** setter for plainInt - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setPlainInt(int v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainInt == null)
-      this.jcasType.jcas.throwFeatMissing("plainInt", "aa.Root");
-    jcasType.ll_cas.ll_setIntValue(addr, ((Root_Type) jcasType).casFeatCode_plainInt, v);
-  }
-
-  // *--------------*
-  // * Feature: plainFloat
-
-  /**
-   * getter for plainFloat - gets
-   * 
-   * @generated
-   */
-  public float getPlainFloat() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainFloat == null)
-      this.jcasType.jcas.throwFeatMissing("plainFloat", "aa.Root");
-    return jcasType.ll_cas.ll_getFloatValue(addr, ((Root_Type) jcasType).casFeatCode_plainFloat);
-  }
-
-  /**
-   * setter for plainFloat - sets
-   * 
+              _casView.setWithCheckAndJournalJFRI(this, _FI_plainInt, () -> _F_plainInt = v);
+      }    
+   
+    
+  //*--------------*
+  //* Feature: plainFloat
+
+  /** getter for plainFloat - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public float getPlainFloat() { return _F_plainFloat;}
+    
+  /** setter for plainFloat - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setPlainFloat(float v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainFloat == null)
-      this.jcasType.jcas.throwFeatMissing("plainFloat", "aa.Root");
-    jcasType.ll_cas.ll_setFloatValue(addr, ((Root_Type) jcasType).casFeatCode_plainFloat, v);
-  }
-
-  // *--------------*
-  // * Feature: plainString
-
-  /**
-   * getter for plainString - gets
-   * 
-   * @generated
-   */
-  public String getPlainString() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainString == null)
-      this.jcasType.jcas.throwFeatMissing("plainString", "aa.Root");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Root_Type) jcasType).casFeatCode_plainString);
-  }
-
-  /**
-   * setter for plainString - sets
-   * 
+              _casView.setWithCheckAndJournalJFRI(this, _FI_plainFloat, () -> _F_plainFloat = v);
+      }    
+   
+    
+  //*--------------*
+  //* Feature: plainString
+
+  /** getter for plainString - gets 
+   * @generated
+   * @return value of the feature 
+   */
+  public String getPlainString() { return _F_plainString;}
+    
+  /** setter for plainString - sets  
    * @generated
+   * @param v value to set into the feature 
    */
   public void setPlainString(String v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainString == null)
-      this.jcasType.jcas.throwFeatMissing("plainString", "aa.Root");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Root_Type) jcasType).casFeatCode_plainString, v);
-  }
-
-  // *--------------*
-  // * Feature: plainRef
-
-  /**
-   * getter for plainRef - gets
-   * 
-   * @generated
-   */
-  public Root getPlainRef() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainRef == null)
-      this.jcasType.jcas.throwFeatMissing("plainRef", "aa.Root");
-    return (Root) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Root_Type) jcasType).casFeatCode_plainRef)));
-  }
-
-  /**
-   * setter for plainRef - sets
-   * 
+              _casView.setWithCheckAndJournalJFRI(this, _FI_plainString, () -> _F_plainString = v);
+      }    
+   
+    
+  //*--------------*
+  //* Feature: plainRef
+
+  /** getter for plainRef - gets TokenType testMissingImport;
+   * @generated
+   * @return value of the feature 
+   */
+  public Root getPlainRef() { return _F_plainRef;}
+    
+  /** setter for plainRef - sets TokenType testMissingImport; 
    * @generated
+   * @param v value to set into the feature 
    */
   public void setPlainRef(Root v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainRef == null)
-      this.jcasType.jcas.throwFeatMissing("plainRef", "aa.Root");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_plainRef,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: concreteString
-
-  /**
-   * getter for concreteString - gets
-   * 
-   * @generated
-   */
-  public String getConcreteString() {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_concreteString == null)
-      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.Root");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((Root_Type) jcasType).casFeatCode_concreteString);
+         
+      _casView.setWithJournalJFRI(this, _FI_plainRef, () -> _F_plainRef = v);
+      }    
   }
 
-  /**
-   * setter for concreteString - sets
-   * 
-   * @generated
-   */
-  public void setConcreteString(String v) {
-    if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_concreteString == null)
-      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.Root");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Root_Type) jcasType).casFeatCode_concreteString, v);
-  }
-}
+    
\ No newline at end of file

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java Wed Nov  4 14:38:50 2015
@@ -1,21 +1,7 @@
-/*
- * 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.
- */
+
+
+   
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
 
 package org.apache.uima.cas.test;
 
@@ -28,7 +14,7 @@ import org.apache.uima.jcas.tcas.Annotat
 
 
 /** 
- * Updated by JCasGen Mon Nov 02 14:34:51 EST 2015
+ * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
  * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
  * @generated */
 public class CrossAnnotation extends Annotation {
@@ -52,6 +38,11 @@ public class CrossAnnotation extends Ann
   /* *****************
    *    Local Data   *
    * *****************/ 
+   
+  /* Register Features */
+  public final static int _FI_otherAnnotation = JCasRegistry.registerFeature(typeIndexID);
+
+   
   private Annotation _F_otherAnnotation;  // 
  
   /** Never called.  Disable default constructor
@@ -102,7 +93,7 @@ public class CrossAnnotation extends Ann
    */
   public void setOtherAnnotation(Annotation v) {
          
-      _casView.setWithJournal(this, _typeImpl.getFeatureByBaseName("otherAnnotation"), () -> _F_otherAnnotation = v);
+      _casView.setWithJournalJFRI(this, _FI_otherAnnotation, () -> _F_otherAnnotation = v);
       }    
   }
 

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java Wed Nov  4 14:38:50 2015
@@ -1,23 +1,7 @@
-/*
- * 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.
- */
+
+
    
-/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 11:17:08 EDT 2015 */
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
 
 package org.apache.uima.cas.test;
 
@@ -30,7 +14,7 @@ import org.apache.uima.jcas.tcas.Annotat
 
 
 /** 
- * Updated by JCasGen Wed Oct 28 11:17:08 EDT 2015
+ * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
  * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
  * @generated */
 public class Sentence extends Annotation {
@@ -50,11 +34,14 @@ public class Sentence extends Annotation
   @Override
   public              int getTypeIndexID() {return typeIndexID;}
  
-
+ 
   /* *****************
    *    Local Data   *
    * *****************/ 
- 
+   
+  /* Register Features */
+
+   
  
   /** Never called.  Disable default constructor
    * @generated */

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java Wed Nov  4 14:38:50 2015
@@ -1,21 +1,3 @@
-/*
- * 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.
- */
 
 
    

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java Wed Nov  4 14:38:50 2015
@@ -1,7 +1,7 @@
 
 
    
-/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 11:25:30 EDT 2015 */
+/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
 
 package org.apache.uima.cas.test;
 
@@ -14,7 +14,7 @@ import org.apache.uima.jcas.tcas.Annotat
 
 
 /** 
- * Updated by JCasGen Wed Oct 28 11:25:30 EDT 2015
+ * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
  * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
  * @generated */
 public class Token extends Annotation {
@@ -34,11 +34,14 @@ public class Token extends Annotation {
   @Override
   public              int getTypeIndexID() {return typeIndexID;}
  
-
+ 
   /* *****************
    *    Local Data   *
    * *****************/ 
- 
+   
+  /* Register Features */
+
+   
  
   /** Never called.  Disable default constructor
    * @generated */

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml?rev=1712555&r1=1712554&r2=1712555&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml Wed Nov  4 14:38:50 2015
@@ -1,4 +1,5 @@
-<typeSystemDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
 	
         <!--
 	 ***************************************************************
@@ -25,295 +26,304 @@
 <types>
 <typeDescription>
 <name>x.y.z.Sentence</name>
-<description></description>
+<description/>
 <supertypeName>uima.tcas.Annotation</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>x.y.z.Token</name>
-<description></description>
+<description/>
 <supertypeName>uima.tcas.Annotation</supertypeName>
 <features>
 <featureDescription>
 <name>ttype</name>
-<description></description>
+<description/>
 <rangeTypeName>x.y.z.TokenType</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>tokenFloatFeat</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Float</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>lemma</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.String</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>sentenceLength</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Integer</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>lemmaList</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.StringArray</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
 <typeDescription>
 <name>x.y.z.TokenType</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>x.y.z.Word</name>
-<description></description>
+<description/>
 <supertypeName>x.y.z.TokenType</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>x.y.z.Separator</name>
-<description></description>
+<description/>
 <supertypeName>x.y.z.TokenType</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>x.y.z.EndOfSentence</name>
-<description></description>
+<description/>
 <supertypeName>x.y.z.TokenType</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>org.apache.lang.LanguagePair</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
 <features>
 <featureDescription>
 <name>lang1</name>
-<description></description>
+<description/>
 <rangeTypeName>org.apache.lang.Group1</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>lang2</name>
-<description></description>
+<description/>
 <rangeTypeName>org.apache.lang.Group2</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>description</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.String</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
 <typeDescription>
 <name>org.apache.lang.Group1</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.String</supertypeName>
 <allowedValues>
 <value>
 <string>"Chinese"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Japanese"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Korean"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"English"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"French"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"German"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Italian"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Spanish"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Portuguese"</string>
-<description></description>
+<description/>
 </value>
 </allowedValues>
 </typeDescription>
 <typeDescription>
 <name>org.apache.lang.Group2</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.String</supertypeName>
 <allowedValues>
 <value>
 <string>"Arabic"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Czech"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Danish"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Dutch"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Finnish"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Greek"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Hebrew"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Hungarian"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Norwegian"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Polish"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Portuguese"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Russian"</string>
-<description></description>
+<description/>
 </value>
 <value>
 <string>"Turkish"</string>
-<description></description>
+<description/>
 </value>
 </allowedValues>
 </typeDescription>
 <typeDescription>
 <name>aa.Root</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
 <features>
 <featureDescription>
 <name>arrayInt</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.IntegerArray</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>arrayRef</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.FSArray</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>arrayFloat</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.FloatArray</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>arrayString</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.StringArray</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>plainInt</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Integer</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>plainFloat</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Float</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>plainString</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.String</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>plainRef</name>
-<description>TokenType testMissingImport;
-</description>
+<description>TokenType testMissingImport;</description>
 <rangeTypeName>aa.Root</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
 <typeDescription>
 <name>aa.MissingInCas</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
-<features>
-</features>
 </typeDescription>
 <typeDescription>
 <name>aa.MissingFeatureInCas</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
 <features>
 <featureDescription>
 <name>haveThisOne</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Integer</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>missingThisOne</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Float</rangeTypeName>
 </featureDescription>
 <featureDescription>
 <name>changedFType</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.String</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
 <typeDescription>
 <name>aa.AbstractType</name>
-<description></description>
+<description/>
 <supertypeName>uima.cas.TOP</supertypeName>
 <features>
 <featureDescription>
 <name>abstractInt</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.Integer</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
 <typeDescription>
 <name>aa.ConcreteType</name>
-<description></description>
+<description/>
 <supertypeName>aa.AbstractType</supertypeName>
 <features>
 <featureDescription>
 <name>concreteString</name>
-<description></description>
+<description/>
 <rangeTypeName>uima.cas.String</rangeTypeName>
 </featureDescription>
 </features>
 </typeDescription>
-</types>
+<typeDescription>
+      <name>org.apache.uima.cas.test.CrossAnnotation</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>otherAnnotation</name>
+          <description/>
+          <rangeTypeName>uima.tcas.Annotation</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+  <typeDescription>
+      <name>org.apache.uima.cas.test.Sentence</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.cas.test.Token</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+    </typeDescription>
+  </types>
 </typeSystemDescription>