svn commit: r660553 [3/10] - in /incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy: ./ src/ src/main/ src/main/descriptors/ src/main/groovy/ src/main/groovy/org/ src/main/groovy/org/apache/ src/main/groovy/org/apache/uima/ src/main/groovy/org/apac...

[sc...@apache.org]

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/groovy/org/apache/uima/annotator/calais_groovy/RdfProcessor.groovy
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/groovy/org/apache/uima/annotator/calais_groovy/RdfProcessor.groovy?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/groovy/org/apache/uima/annotator/calais_groovy/RdfProcessor.groovy (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/groovy/org/apache/uima/annotator/calais_groovy/RdfProcessor.groovy Tue May 27 08:13:37 2008
@@ -0,0 +1,187 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.annotator.calais_groovy
+
+import org.apache.uima.jcas.cas.FSArray
+import org.apache.uima.analysis_component.JCasAnnotator_ImplBase
+import org.apache.uima.jcas.JCas
+
+
+public class RdfProcessor extends JCasAnnotator_ImplBase{
+  
+  static debugPrint = 0
+
+  def descriptionMap // map, key = url-like ids, value = description node
+  def entityMap
+  def relationMap
+  def instances
+  static final multiCompanyRelations = ['Alliance', 'BusinessRelation', 'JointVenture', 'Merger']
+
+  
+  /* (non-Javadoc)
+   * @see org.apache.uima.analysis_component.JCasAnnotator_ImplBase#process(org.apache.uima.jcas.JCas)
+   */
+  public void process(JCas jcas){
+    def rdfindex = jcas.getIndexRepository().getIndex("org.apache.uima.annotator.calais.Rdf")
+    rdfindex.each { processRdf(it, jcas) } // should only be one
+  }
+  
+  def processRdf(rdfTextInstance, jcas) {
+    // 4 passes
+    // pass 1 - create url to node map
+    // pass 2 - create entities
+    // pass 3 - create relations (point to entities)
+    // pass 4 - create instances of entities and relations - 
+    //          ref entities and relations, and have begin/end refs to text
+ 
+    // pass 2, 3, and 4 blended and done in 1 iteration.  
+    def rdf = new XmlSlurper().parseText(rdfTextInstance.rdfText)
+    // pass 1
+    
+    descriptionMap = [ : ]   
+    rdf.Description.each {descriptionMap.put(it.@about.toString(), it)}
+
+    if (debugPrint >= 3) { 
+      descriptionMap.each {k, v -> println "key = $k,  value=$v"}
+    }
+    // pass 2, 3 and 4 blended
+    entityMap = [ : ]  // key = url for entity, value = featureStructure for it
+    instances = []
+    
+    relationMap = [ : ] 
+    
+    rdf.Description.each {
+      def typeurl = it.type[0].@resource
+      if (isEntity(typeurl)) {
+        getOrMakeEntity(it.@about.toString(), jcas)
+      } else if (isRelation(typeurl)) {
+        getOrMakeRelation(it.@about.toString(), jcas)
+      } else if (isInstance(typeurl)) {
+        def entityOrRelation = descriptionMap.get(it.subject[0].@resource.toString())
+        def is_entity = isEntity(entityOrRelation.type[0].@resource)
+        def kind = is_entity ? 'Entity' : 'Relation'
+        def instance = newJCasInstance(jcas, "${kind}Instance")
+        instances.add(instance)
+        if (is_entity) {
+          instance.entity = getOrMakeEntity(entityOrRelation.@about.toString(), jcas)
+        } else {
+          instance.relation = getOrMakeRelation(entityOrRelation.@about.toString(), jcas)
+        }
+        instance.begin = Integer.valueOf(it.offset[0].text())
+        instance.end =   Integer.valueOf(it.offset[0].text()) + Integer.valueOf(it.length[0].text())    
+        instance.addToIndexes()
+      }
+    }
+
+
+    if (debugPrint >= 2) {
+      entityMap.each{k, v -> println "entity key = $k,  value=$v"} // test-debug
+    }
+   
+    if (debugPrint >= 2) {
+      relationMap.each {k, v -> println "relation: k: $k, v: $v"}  // debug test
+    }
+           
+    if (debugPrint >= 1) {
+      instances.each {println "instance $it"}
+    }
+    
+    descriptionMap = entityMap = relationMap = instances = null
+
+  }
+  
+  def lastPart(thing) {
+    def s = thing.toString()
+    s.substring(s.lastIndexOf('/') + 1)
+  }
+
+  def isRelation(url) {
+//      println " is relation: ${url.toString()}"
+      return url?.toString()?.startsWith('http://s.opencalais.com/1/type/em/r/')
+  }
+
+  def isEntity(url) {
+//      println " is relation: ${url.toString()}"
+      return url?.toString()?.startsWith('http://s.opencalais.com/1/type/em/e/')
+  }
+
+  def isInstance(url) {
+//  println " is relation: ${url.toString()}"
+  return (url?.toString() == 'http://s.opencalais.com/1/type/sys/InstanceInfo')
+}
+
+  def newJCasInstance(jcas, type) {
+    def clasz = Class.forName("org.apache.uima.calaisType.$type".toString(), true, jcas.getCas().JCasClassLoader)
+    def constructor = clasz.getDeclaredConstructor(JCas.class);
+    return constructor.newInstance(jcas)
+    // mock as a map
+//    return args.clone()
+  }
+
+  def getOrMakeEntity(key, jcas) {
+    def instance = entityMap.get(key)
+    if (instance) {
+      return instance
+    }
+    def description = descriptionMap[key]
+    def typeurl = description.type[0].@resource
+    instance = newJCasInstance(jcas, "entity.${lastPart(typeurl)}")
+    entityMap.put(key, instance)    
+    instance.canonicalForm = description.name[0].text()                                    
+    instance.addToIndexes()
+    return instance
+  }
+  
+  def getOrMakeRelation(key, jcas) {
+    def instance = relationMap.get(key)
+    if (instance) {
+      return instance
+    }
+    def description = descriptionMap[key]
+    def typeurl = description.type[0].@resource
+    def relationName = lastPart(typeurl)
+    instance = newJCasInstance(jcas, "relation.$relationName")
+    relationMap.put(description.@about.toString(), instance)
+
+    def multiCompany = multiCompanyRelations.contains(relationName)
+    if (multiCompany) {
+      // special handling - make an fs array of all companies
+      def numberOfCompanies = description.company.size()
+      instance.company = new FSArray(jcas, numberOfCompanies)
+      description.company.eachWithIndex {obj, i ->
+        instance.setCompany(i, entityMap.get(obj.@resource.toString()))
+      }
+    }
+    description.children().each {
+      def featureName = it.name()
+      if (featureName == 'type' || 
+          (multiCompany && featureName == 'company')) {
+        return
+      }
+      def resourceurl = it.@resource.toString()
+      if (resourceurl) {
+        def value = getOrMakeEntity(resourceurl, jcas)
+        instance[featureName] = value
+      } else {
+        instance[featureName] = it.text()
+      }
+    }
+    instance.addToIndexes()
+  }
+}

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base.java Tue May 27 08:13:37 2008
@@ -0,0 +1,54 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+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.cas.TOP;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Base extends TOP {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Base.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Base() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Base(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Base(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+}
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,55 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Base_Type extends TOP_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Base_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Base_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Base(addr, Base_Type.this);
+  			   Base_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Base(addr, Base_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Base.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.Base");
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Base_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Base_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity.java Tue May 27 08:13:37 2008
@@ -0,0 +1,53 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Entity extends Base {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Entity.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Entity() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Entity(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Entity(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+}
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class EntityInstance extends Instance {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(EntityInstance.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected EntityInstance() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public EntityInstance(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public EntityInstance(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** @generated */  
+  public EntityInstance(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: entity
+
+  /** getter for entity - gets 
+   * @generated */
+  public Entity getEntity() {
+    if (EntityInstance_Type.featOkTst && ((EntityInstance_Type)jcasType).casFeat_entity == null)
+      jcasType.jcas.throwFeatMissing("entity", "org.apache.uima.calaisType.EntityInstance");
+    return (Entity)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((EntityInstance_Type)jcasType).casFeatCode_entity)));}
+    
+  /** setter for entity - sets  
+   * @generated */
+  public void setEntity(Entity v) {
+    if (EntityInstance_Type.featOkTst && ((EntityInstance_Type)jcasType).casFeat_entity == null)
+      jcasType.jcas.throwFeatMissing("entity", "org.apache.uima.calaisType.EntityInstance");
+    jcasType.ll_cas.ll_setRefValue(addr, ((EntityInstance_Type)jcasType).casFeatCode_entity, jcasType.ll_cas.ll_getFSRef(v));}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,78 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class EntityInstance_Type extends Instance_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (EntityInstance_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = EntityInstance_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new EntityInstance(addr, EntityInstance_Type.this);
+  			   EntityInstance_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new EntityInstance(addr, EntityInstance_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = EntityInstance.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.EntityInstance");
+ 
+  /** @generated */
+  final Feature casFeat_entity;
+  /** @generated */
+  final int     casFeatCode_entity;
+  /** @generated */ 
+  public int getEntity(int addr) {
+        if (featOkTst && casFeat_entity == null)
+      jcas.throwFeatMissing("entity", "org.apache.uima.calaisType.EntityInstance");
+    return ll_cas.ll_getRefValue(addr, casFeatCode_entity);
+  }
+  /** @generated */    
+  public void setEntity(int addr, int v) {
+        if (featOkTst && casFeat_entity == null)
+      jcas.throwFeatMissing("entity", "org.apache.uima.calaisType.EntityInstance");
+    ll_cas.ll_setRefValue(addr, casFeatCode_entity, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public EntityInstance_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_entity = jcas.getRequiredFeatureDE(casType, "entity", "org.apache.uima.calaisType.Entity", featOkTst);
+    casFeatCode_entity  = (null == casFeat_entity) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_entity).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/EntityInstance_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,54 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Entity_Type extends Base_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Entity_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Entity_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Entity(addr, Entity_Type.this);
+  			   Entity_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Entity(addr, Entity_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Entity.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.Entity");
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Entity_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Entity_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance.java Tue May 27 08:13:37 2008
@@ -0,0 +1,62 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+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 Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Instance extends Annotation {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Instance.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Instance() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Instance(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Instance(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** @generated */  
+  public Instance(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() {}
+     
+}
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,55 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.tcas.Annotation_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Instance_Type extends Annotation_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Instance_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Instance_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Instance(addr, Instance_Type.this);
+  			   Instance_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Instance(addr, Instance_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Instance.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.Instance");
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Instance_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Instance_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:20 EDT 2008 */
+package org.apache.uima.calaisType;
+
+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.cas.TOP;
+
+
+/** Returned value from web service in RDF form
+ * Updated by JCasGen Mon May 26 21:43:20 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class RdfText extends TOP {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(RdfText.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected RdfText() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public RdfText(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public RdfText(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: rdfText
+
+  /** getter for rdfText - gets 
+   * @generated */
+  public String getRdfText() {
+    if (RdfText_Type.featOkTst && ((RdfText_Type)jcasType).casFeat_rdfText == null)
+      jcasType.jcas.throwFeatMissing("rdfText", "org.apache.uima.calaisType.RdfText");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((RdfText_Type)jcasType).casFeatCode_rdfText);}
+    
+  /** setter for rdfText - sets  
+   * @generated */
+  public void setRdfText(String v) {
+    if (RdfText_Type.featOkTst && ((RdfText_Type)jcasType).casFeat_rdfText == null)
+      jcasType.jcas.throwFeatMissing("rdfText", "org.apache.uima.calaisType.RdfText");
+    jcasType.ll_cas.ll_setStringValue(addr, ((RdfText_Type)jcasType).casFeatCode_rdfText, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:20 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+/** Returned value from web service in RDF form
+ * Updated by JCasGen Mon May 26 21:43:20 EDT 2008
+ * @generated */
+public class RdfText_Type extends TOP_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (RdfText_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = RdfText_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new RdfText(addr, RdfText_Type.this);
+  			   RdfText_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new RdfText(addr, RdfText_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = RdfText.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.RdfText");
+ 
+  /** @generated */
+  final Feature casFeat_rdfText;
+  /** @generated */
+  final int     casFeatCode_rdfText;
+  /** @generated */ 
+  public String getRdfText(int addr) {
+        if (featOkTst && casFeat_rdfText == null)
+      jcas.throwFeatMissing("rdfText", "org.apache.uima.calaisType.RdfText");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_rdfText);
+  }
+  /** @generated */    
+  public void setRdfText(int addr, String v) {
+        if (featOkTst && casFeat_rdfText == null)
+      jcas.throwFeatMissing("rdfText", "org.apache.uima.calaisType.RdfText");
+    ll_cas.ll_setStringValue(addr, casFeatCode_rdfText, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public RdfText_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_rdfText = jcas.getRequiredFeatureDE(casType, "rdfText", "uima.cas.String", featOkTst);
+    casFeatCode_rdfText  = (null == casFeat_rdfText) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_rdfText).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RdfText_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation.java Tue May 27 08:13:37 2008
@@ -0,0 +1,53 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Relation extends Base {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Relation.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Relation() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Relation(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Relation(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+}
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class RelationInstance extends Instance {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(RelationInstance.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected RelationInstance() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public RelationInstance(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public RelationInstance(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** @generated */  
+  public RelationInstance(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: relation
+
+  /** getter for relation - gets 
+   * @generated */
+  public Relation getRelation() {
+    if (RelationInstance_Type.featOkTst && ((RelationInstance_Type)jcasType).casFeat_relation == null)
+      jcasType.jcas.throwFeatMissing("relation", "org.apache.uima.calaisType.RelationInstance");
+    return (Relation)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((RelationInstance_Type)jcasType).casFeatCode_relation)));}
+    
+  /** setter for relation - sets  
+   * @generated */
+  public void setRelation(Relation v) {
+    if (RelationInstance_Type.featOkTst && ((RelationInstance_Type)jcasType).casFeat_relation == null)
+      jcasType.jcas.throwFeatMissing("relation", "org.apache.uima.calaisType.RelationInstance");
+    jcasType.ll_cas.ll_setRefValue(addr, ((RelationInstance_Type)jcasType).casFeatCode_relation, jcasType.ll_cas.ll_getFSRef(v));}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,78 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class RelationInstance_Type extends Instance_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (RelationInstance_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = RelationInstance_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new RelationInstance(addr, RelationInstance_Type.this);
+  			   RelationInstance_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new RelationInstance(addr, RelationInstance_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = RelationInstance.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.RelationInstance");
+ 
+  /** @generated */
+  final Feature casFeat_relation;
+  /** @generated */
+  final int     casFeatCode_relation;
+  /** @generated */ 
+  public int getRelation(int addr) {
+        if (featOkTst && casFeat_relation == null)
+      jcas.throwFeatMissing("relation", "org.apache.uima.calaisType.RelationInstance");
+    return ll_cas.ll_getRefValue(addr, casFeatCode_relation);
+  }
+  /** @generated */    
+  public void setRelation(int addr, int v) {
+        if (featOkTst && casFeat_relation == null)
+      jcas.throwFeatMissing("relation", "org.apache.uima.calaisType.RelationInstance");
+    ll_cas.ll_setRefValue(addr, casFeatCode_relation, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public RelationInstance_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_relation = jcas.getRequiredFeatureDE(casType, "relation", "org.apache.uima.calaisType.Relation", featOkTst);
+    casFeatCode_relation  = (null == casFeat_relation) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_relation).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/RelationInstance_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,54 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Relation_Type extends Base_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Relation_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Relation_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Relation(addr, Relation_Type.this);
+  			   Relation_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Relation(addr, Relation_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Relation.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.Relation");
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Relation_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/Relation_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Anniversary extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Anniversary.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Anniversary() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Anniversary(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Anniversary(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (Anniversary_Type.featOkTst && ((Anniversary_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Anniversary");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((Anniversary_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (Anniversary_Type.featOkTst && ((Anniversary_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Anniversary");
+    jcasType.ll_cas.ll_setStringValue(addr, ((Anniversary_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.calaisType.Entity_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Anniversary_Type extends Entity_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Anniversary_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Anniversary_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Anniversary(addr, Anniversary_Type.this);
+  			   Anniversary_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Anniversary(addr, Anniversary_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Anniversary.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.entity.Anniversary");
+ 
+  /** @generated */
+  final Feature casFeat_canonicalForm;
+  /** @generated */
+  final int     casFeatCode_canonicalForm;
+  /** @generated */ 
+  public String getCanonicalForm(int addr) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Anniversary");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_canonicalForm);
+  }
+  /** @generated */    
+  public void setCanonicalForm(int addr, String v) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Anniversary");
+    ll_cas.ll_setStringValue(addr, casFeatCode_canonicalForm, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Anniversary_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String", featOkTst);
+    casFeatCode_canonicalForm  = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_canonicalForm).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Anniversary_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class City extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(City.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected City() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public City(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public City(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (City_Type.featOkTst && ((City_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.City");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((City_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (City_Type.featOkTst && ((City_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.City");
+    jcasType.ll_cas.ll_setStringValue(addr, ((City_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.calaisType.Entity_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class City_Type extends Entity_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (City_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = City_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new City(addr, City_Type.this);
+  			   City_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new City(addr, City_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = City.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.entity.City");
+ 
+  /** @generated */
+  final Feature casFeat_canonicalForm;
+  /** @generated */
+  final int     casFeatCode_canonicalForm;
+  /** @generated */ 
+  public String getCanonicalForm(int addr) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.City");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_canonicalForm);
+  }
+  /** @generated */    
+  public void setCanonicalForm(int addr, String v) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.City");
+    ll_cas.ll_setStringValue(addr, casFeatCode_canonicalForm, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public City_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String", featOkTst);
+    casFeatCode_canonicalForm  = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_canonicalForm).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/City_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Company extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Company.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Company() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Company(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Company(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (Company_Type.featOkTst && ((Company_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Company");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((Company_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (Company_Type.featOkTst && ((Company_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Company");
+    jcasType.ll_cas.ll_setStringValue(addr, ((Company_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.calaisType.Entity_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Company_Type extends Entity_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Company_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Company_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Company(addr, Company_Type.this);
+  			   Company_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Company(addr, Company_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Company.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.entity.Company");
+ 
+  /** @generated */
+  final Feature casFeat_canonicalForm;
+  /** @generated */
+  final int     casFeatCode_canonicalForm;
+  /** @generated */ 
+  public String getCanonicalForm(int addr) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Company");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_canonicalForm);
+  }
+  /** @generated */    
+  public void setCanonicalForm(int addr, String v) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Company");
+    ll_cas.ll_setStringValue(addr, casFeatCode_canonicalForm, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Company_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String", featOkTst);
+    casFeatCode_canonicalForm  = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_canonicalForm).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Company_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Continent extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Continent.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Continent() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Continent(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Continent(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (Continent_Type.featOkTst && ((Continent_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Continent");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((Continent_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (Continent_Type.featOkTst && ((Continent_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Continent");
+    jcasType.ll_cas.ll_setStringValue(addr, ((Continent_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.calaisType.Entity_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Continent_Type extends Entity_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Continent_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Continent_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Continent(addr, Continent_Type.this);
+  			   Continent_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Continent(addr, Continent_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Continent.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.entity.Continent");
+ 
+  /** @generated */
+  final Feature casFeat_canonicalForm;
+  /** @generated */
+  final int     casFeatCode_canonicalForm;
+  /** @generated */ 
+  public String getCanonicalForm(int addr) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Continent");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_canonicalForm);
+  }
+  /** @generated */    
+  public void setCanonicalForm(int addr, String v) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Continent");
+    ll_cas.ll_setStringValue(addr, casFeatCode_canonicalForm, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Continent_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String", featOkTst);
+    casFeatCode_canonicalForm  = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_canonicalForm).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Continent_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Country extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Country.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Country() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Country(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Country(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (Country_Type.featOkTst && ((Country_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Country");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((Country_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (Country_Type.featOkTst && ((Country_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Country");
+    jcasType.ll_cas.ll_setStringValue(addr, ((Country_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country_Type.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country_Type.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country_Type.java Tue May 27 08:13:37 2008
@@ -0,0 +1,79 @@
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureImpl;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.calaisType.Entity_Type;
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * @generated */
+public class Country_Type extends Entity_Type {
+  /** @generated */
+  protected FSGenerator getFSGenerator() {return fsGenerator;}
+  /** @generated */
+  private final FSGenerator fsGenerator = 
+    new FSGenerator() {
+      public FeatureStructure createFS(int addr, CASImpl cas) {
+  			 if (Country_Type.this.useExistingInstance) {
+  			   // Return eq fs instance if already created
+  		     FeatureStructure fs = Country_Type.this.jcas.getJfsFromCaddr(addr);
+  		     if (null == fs) {
+  		       fs = new Country(addr, Country_Type.this);
+  			   Country_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  			   return fs;
+  		     }
+  		     return fs;
+        } else return new Country(addr, Country_Type.this);
+  	  }
+    };
+  /** @generated */
+  public final static int typeIndexID = Country.typeIndexID;
+  /** @generated 
+     @modifiable */
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.calaisType.entity.Country");
+ 
+  /** @generated */
+  final Feature casFeat_canonicalForm;
+  /** @generated */
+  final int     casFeatCode_canonicalForm;
+  /** @generated */ 
+  public String getCanonicalForm(int addr) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Country");
+    return ll_cas.ll_getStringValue(addr, casFeatCode_canonicalForm);
+  }
+  /** @generated */    
+  public void setCanonicalForm(int addr, String v) {
+        if (featOkTst && casFeat_canonicalForm == null)
+      jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Country");
+    ll_cas.ll_setStringValue(addr, casFeatCode_canonicalForm, v);}
+    
+  
+
+
+
+  /** initialize variables to correspond with Cas Type and Features
+	* @generated */
+  public Country_Type(JCas jcas, Type casType) {
+    super(jcas, casType);
+    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
+
+ 
+    casFeat_canonicalForm = jcas.getRequiredFeatureDE(casType, "canonicalForm", "uima.cas.String", featOkTst);
+    casFeatCode_canonicalForm  = (null == casFeat_canonicalForm) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_canonicalForm).getCode();
+
+  }
+}
+
+
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Country_Type.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Currency.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Currency.java?rev=660553&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Currency.java (added)
+++ incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Currency.java Tue May 27 08:13:37 2008
@@ -0,0 +1,72 @@
+
+
+/* First created by JCasGen Mon May 26 21:43:18 EDT 2008 */
+package org.apache.uima.calaisType.entity;
+
+import org.apache.uima.jcas.JCas; 
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+import org.apache.uima.calaisType.Entity;
+
+
+/** 
+ * Updated by JCasGen Mon May 26 21:43:18 EDT 2008
+ * XML source: C:/a/Eclipse/3.3/apache/OpenCalaisAnnotatorGroovy/src/main/descriptors/CalaisTestCollectionReader.xml
+ * @generated */
+public class Currency extends Entity {
+  /** @generated
+   * @ordered 
+   */
+  public final static int typeIndexID = JCasRegistry.register(Currency.class);
+  /** @generated
+   * @ordered 
+   */
+  public final static int type = typeIndexID;
+  /** @generated  */
+  public              int getTypeIndexID() {return typeIndexID;}
+ 
+  /** Never called.  Disable default constructor
+   * @generated */
+  protected Currency() {}
+    
+  /** Internal - constructor used by generator 
+   * @generated */
+  public Currency(int addr, TOP_Type type) {
+    super(addr, type);
+    readObject();
+  }
+  
+  /** @generated */
+  public Currency(JCas jcas) {
+    super(jcas);
+    readObject();   
+  } 
+
+  /** <!-- begin-user-doc -->
+    * Write your own initialization here
+    * <!-- end-user-doc -->
+  @generated modifiable */
+  private void readObject() {}
+     
+ 
+    
+  //*--------------*
+  //* Feature: canonicalForm
+
+  /** getter for canonicalForm - gets 
+   * @generated */
+  public String getCanonicalForm() {
+    if (Currency_Type.featOkTst && ((Currency_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Currency");
+    return jcasType.ll_cas.ll_getStringValue(addr, ((Currency_Type)jcasType).casFeatCode_canonicalForm);}
+    
+  /** setter for canonicalForm - sets  
+   * @generated */
+  public void setCanonicalForm(String v) {
+    if (Currency_Type.featOkTst && ((Currency_Type)jcasType).casFeat_canonicalForm == null)
+      jcasType.jcas.throwFeatMissing("canonicalForm", "org.apache.uima.calaisType.entity.Currency");
+    jcasType.ll_cas.ll_setStringValue(addr, ((Currency_Type)jcasType).casFeatCode_canonicalForm, v);}    
+  }
+
+    
\ No newline at end of file

Propchange: incubator/uima/sandbox/trunk/OpenCalaisAnnotatorGroovy/src/main/java/org/apache/uima/calaisType/entity/Currency.java
------------------------------------------------------------------------------
    svn:eol-style = native