You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2009/06/12 15:33:07 UTC

svn commit: r784113 - in /incubator/uima/sandbox/trunk/TikaAnnotator: desc/ src/main/java/org/apache/uima/tika/

Author: twgoetz
Date: Fri Jun 12 13:33:07 2009
New Revision: 784113

URL: http://svn.apache.org/viewvc?rev=784113&view=rev
Log:
Jira UIMA-1379: fix type system package.

https://issues.apache.org/jira/browse/UIMA-1379

Modified:
    incubator/uima/sandbox/trunk/TikaAnnotator/desc/FileSystemCollectionReader.xml
    incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
    incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotator.xml
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS_Type.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue_Type.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation_Type.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotator.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupHandler.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation_Type.java
    incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/TIKAWrapper.java

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/desc/FileSystemCollectionReader.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/desc/FileSystemCollectionReader.xml?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/desc/FileSystemCollectionReader.xml (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/desc/FileSystemCollectionReader.xml Fri Jun 12 13:33:07 2009
@@ -1,113 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
- -->
-<collectionReaderDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <implementationName>org.apache.uima.tika.FileSystemCollectionReader</implementationName>
-  <processingResourceMetaData>
-    <name>File System Collection Reader</name>
-    <description>Reads files from the filesystem. Uses Tika to convert markups into annotation</description>
-    <version>1.0</version>
-    <vendor>DigitalPebble</vendor>
-    <configurationParameters>
-      <configurationParameter>
-        <name>InputDirectory</name>
-        <description>Directory containing input files</description>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter> 
-        <name>Language</name>
-        <description>ISO language code for the documents</description>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>false</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>tikaConfigFile</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>false</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>MIME</name>
-        <description>MIME type can be forced by the user instead of being detected automatically</description>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>false</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>MIME</name>
-        <value>
-          <string>text/html</string>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-        <import name="MarkupAnnotationTypeSystem"/>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <outputs>
-          <type allAnnotatorFeatures="true">com.digitalpebble.uima.SourceDocumentAnnotation</type>
-          <type allAnnotatorFeatures="true">com.digitalpebble.uima.MarkupAnnotation</type>
-          <type allAnnotatorFeatures="true">com.digitalpebble.uima.FeatureValue</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>false</multipleDeploymentAllowed>
-      <outputsNewCASes>true</outputsNewCASes>
-    </operationalProperties>
-  </processingResourceMetaData>
-  <externalResourceDependencies>
-    <externalResourceDependency>
-      <key>tikaConfigFile</key>
-      <description>XML configuration file for Tika</description>
-      <optional>true</optional>
-    </externalResourceDependency>
-  </externalResourceDependencies>
-  <resourceManagerConfiguration>
-    <externalResources>
-      <externalResource>
-        <name>tikaConfigFile</name>
-        <description>XMLconfig file for Tika. If not found the component will rely on the default config</description>
-        <fileResourceSpecifier>
-          <fileUrl>tika_config.xml</fileUrl>
-        </fileResourceSpecifier>
-      </externalResource>
-    </externalResources>
-    <externalResourceBindings>
-      <externalResourceBinding>
-        <key>tikaConfigFile</key>
-        <resourceName>tikaConfigFile</resourceName>
-      </externalResourceBinding>
-    </externalResourceBindings>
-  </resourceManagerConfiguration>
-</collectionReaderDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<collectionReaderDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+  <implementationName>org.apache.uima.tika.FileSystemCollectionReader</implementationName>
+  <processingResourceMetaData>
+    <name>File System Collection Reader</name>
+    <description>Reads files from the filesystem. Uses Tika to convert markups into annotation</description>
+    <version>1.0</version>
+    <vendor>Apache Software Foundation</vendor>
+    <configurationParameters>
+      <configurationParameter>
+        <name>InputDirectory</name>
+        <description>Directory containing input files</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>Language</name>
+        <description>ISO language code for the documents</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>tikaConfigFile</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>MIME</name>
+        <description>MIME type can be forced by the user instead of being detected automatically</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+    </configurationParameters>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>MIME</name>
+        <value>
+          <string>text/html</string>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
+    <typeSystemDescription>
+      <imports>
+        <import name="MarkupAnnotationTypeSystem"/>
+      </imports>
+    </typeSystemDescription>
+    <typePriorities/>
+    <fsIndexCollection/>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs>
+          <type allAnnotatorFeatures="true">com.digitalpebble.uima.SourceDocumentAnnotation</type>
+          <type allAnnotatorFeatures="true">com.digitalpebble.uima.MarkupAnnotation</type>
+          <type allAnnotatorFeatures="true">com.digitalpebble.uima.FeatureValue</type>
+        </outputs>
+        <languagesSupported/>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>false</multipleDeploymentAllowed>
+      <outputsNewCASes>true</outputsNewCASes>
+    </operationalProperties>
+  </processingResourceMetaData>
+  <externalResourceDependencies>
+    <externalResourceDependency>
+      <key>tikaConfigFile</key>
+      <description>XML configuration file for Tika</description>
+      <optional>true</optional>
+    </externalResourceDependency>
+  </externalResourceDependencies>
+  <resourceManagerConfiguration>
+    <externalResources>
+      <externalResource>
+        <name>tikaConfigFile</name>
+        <description>XMLconfig file for Tika. If not found the component will rely on the default config</description>
+        <fileResourceSpecifier>
+          <fileUrl>tika_config.xml</fileUrl>
+        </fileResourceSpecifier>
+      </externalResource>
+    </externalResources>
+    <externalResourceBindings>
+      <externalResourceBinding>
+        <key>tikaConfigFile</key>
+        <resourceName>tikaConfigFile</resourceName>
+      </externalResourceBinding>
+    </externalResourceBindings>
+  </resourceManagerConfiguration>
+</collectionReaderDescription>

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml Fri Jun 12 13:33:07 2009
@@ -1,133 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
- -->
-<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <name>MarkupAnnotationTypeSystem</name>
-  <description>Annotations used for representing markup. See http://cwiki.apache.org/UIMA/uima-sandbox-components.html</description>
-  <version>1.0</version>
-  <vendor>DigitalPebble</vendor>
-  <types>
-    <typeDescription>
-      <name>org.apache.uima.MarkupAnnotation</name>
-      <description/>
-      <supertypeName>uima.tcas.Annotation</supertypeName>
-      <features>
-        <featureDescription>
-          <name>attributes</name>
-          <description/>
-          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
-          <elementType>uima.cas.FSArray</elementType>
-        </featureDescription>
-        <featureDescription>
-          <name>children</name>
-          <description/>
-          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
-          <elementType>org.apache.uima.MarkupAnnotation</elementType>
-        </featureDescription>
-        <featureDescription>
-          <name>name</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>parent</name>
-          <description/>
-          <rangeTypeName>org.apache.uima.MarkupAnnotation</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>qualifiedName</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>uri</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-      </features>
-    </typeDescription>
-    <typeDescription>
-      <name>org.apache.uima.AttributeFS</name>
-      <description>Representation of an attribute</description>
-      <supertypeName>uima.cas.TOP</supertypeName>
-      <features>
-        <featureDescription>
-          <name>localName</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>qualifiedName</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>uri</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>value</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-      </features>
-    </typeDescription>
-    <typeDescription>
-      <name>org.apache.uima.SourceDocumentAnnotation</name>
-      <description/>
-      <supertypeName>uima.tcas.DocumentAnnotation</supertypeName>
-      <features>
-        <featureDescription>
-          <name>uri</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>contentType</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>features</name>
-          <description/>
-          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
-          <elementType>org.apache.uima.FeatureValue</elementType>
-        </featureDescription>
-      </features>
-    </typeDescription>
-    <typeDescription>
-      <name>org.apache.uima.FeatureValue</name>
-      <description>Simple Feature Value</description>
-      <supertypeName>uima.cas.TOP</supertypeName>
-      <features>
-        <featureDescription>
-          <name>name</name>
-          <description>name of the feature</description>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-        <featureDescription>
-          <name>value</name>
-          <description/>
-          <rangeTypeName>uima.cas.String</rangeTypeName>
-        </featureDescription>
-      </features>
-    </typeDescription>
-  </types>
-</typeSystemDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  <name>MarkupAnnotationTypeSystem</name>
+  <description>Annotations used for representing markup. See http://cwiki.apache.org/UIMA/uima-sandbox-components.html</description>
+  <version>1.0</version>
+  <vendor>Apache Software Foundation</vendor>
+  <types>
+    <typeDescription>
+      <name>org.apache.uima.tika.MarkupAnnotation</name>
+      <description/>
+      <supertypeName>uima.tcas.Annotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>attributes</name>
+          <description/>
+          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+          <elementType>uima.cas.FSArray</elementType>
+        </featureDescription>
+        <featureDescription>
+          <name>children</name>
+          <description/>
+          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+          <elementType>org.apache.uima.tika.MarkupAnnotation</elementType>
+        </featureDescription>
+        <featureDescription>
+          <name>name</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>parent</name>
+          <description/>
+          <rangeTypeName>org.apache.uima.tika.MarkupAnnotation</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>qualifiedName</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>uri</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.tika.AttributeFS</name>
+      <description>Representation of an attribute</description>
+      <supertypeName>uima.cas.TOP</supertypeName>
+      <features>
+        <featureDescription>
+          <name>localName</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>qualifiedName</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>uri</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>value</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.tika.SourceDocumentAnnotation</name>
+      <description/>
+      <supertypeName>uima.tcas.DocumentAnnotation</supertypeName>
+      <features>
+        <featureDescription>
+          <name>uri</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>contentType</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>features</name>
+          <description/>
+          <rangeTypeName>uima.cas.FSArray</rangeTypeName>
+          <elementType>org.apache.uima.tika.FeatureValue</elementType>
+        </featureDescription>
+      </features>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.tika.FeatureValue</name>
+      <description>Simple Feature Value</description>
+      <supertypeName>uima.cas.TOP</supertypeName>
+      <features>
+        <featureDescription>
+          <name>name</name>
+          <description>name of the feature</description>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
+          <name>value</name>
+          <description/>
+          <rangeTypeName>uima.cas.String</rangeTypeName>
+        </featureDescription>
+      </features>
+    </typeDescription>
+  </types>
+</typeSystemDescription>

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotator.xml?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotator.xml (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/desc/MarkupAnnotator.xml Fri Jun 12 13:33:07 2009
@@ -1,120 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
- -->
-<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.uima.tika.MarkupAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>org.apache.uima.tika.MarkupAnnotator</name>
-    <description>Uses Tika to generate annotations from original markup</description>
-    <version>1.0</version>
-    <vendor>DigitalPebble</vendor>
-    <configurationParameters>
-      <configurationParameter>
-        <name>ORIGINAL_VIEW_PARAM_NAME</name>
-        <description>Name of the view used for storing the original content</description>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>TEXT_VIEW_PARAM_NAME</name>
-        <description>Name of the view used to store the text extracted from the original document</description>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>SET_TEXT_VIEW_DEFAULT_PARAM_NAME</name>
-        <description>Indicates whether the Text view should be marked as the one to use by default</description>
-        <type>Boolean</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>ORIGINAL_VIEW_PARAM_NAME</name>
-        <value>
-          <string>_InitialView</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>TEXT_VIEW_PARAM_NAME</name>
-        <value>
-          <string>textView</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>SET_TEXT_VIEW_DEFAULT_PARAM_NAME</name>
-        <value>
-          <boolean>true</boolean>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-        <import name="MarkupAnnotationTypeSystem"/>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.uima.MarkupAnnotation</type>
-        </outputs>
-        <languagesSupported>
-          <language>x-unspecified</language>
-        </languagesSupported>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>true</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <externalResourceDependencies>
-    <externalResourceDependency>
-      <key>tikaConfigFile</key>
-      <description>XML configuration file for Tika</description>
-      <optional>true</optional>
-    </externalResourceDependency>
-  </externalResourceDependencies>
-  <resourceManagerConfiguration>
-    <externalResources>
-      <externalResource>
-        <name>tikaConfigFile</name>
-        <description>XMLconfig file for Tika. If not found the component will rely on the default config</description>
-        <fileResourceSpecifier>
-          <fileUrl>tika_config.xml</fileUrl>
-        </fileResourceSpecifier>
-      </externalResource>
-    </externalResources>
-    <externalResourceBindings>
-      <externalResourceBinding>
-        <key>tikaConfigFile</key>
-        <resourceName>tikaConfigFile</resourceName>
-      </externalResourceBinding>
-    </externalResourceBindings>
-  </resourceManagerConfiguration>
-</analysisEngineDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+  <primitive>true</primitive>
+  <annotatorImplementationName>org.apache.uima.tika.MarkupAnnotator</annotatorImplementationName>
+  <analysisEngineMetaData>
+    <name>org.apache.uima.tika.MarkupAnnotator</name>
+    <description>Uses Tika to generate annotations from original markup</description>
+    <version>1.0</version>
+    <vendor>Apache Software Foundation</vendor>
+    <configurationParameters>
+      <configurationParameter>
+        <name>ORIGINAL_VIEW_PARAM_NAME</name>
+        <description>Name of the view used for storing the original content</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>TEXT_VIEW_PARAM_NAME</name>
+        <description>Name of the view used to store the text extracted from the original document</description>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>SET_TEXT_VIEW_DEFAULT_PARAM_NAME</name>
+        <description>Indicates whether the Text view should be marked as the one to use by default</description>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+    </configurationParameters>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>ORIGINAL_VIEW_PARAM_NAME</name>
+        <value>
+          <string>_InitialView</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>TEXT_VIEW_PARAM_NAME</name>
+        <value>
+          <string>textView</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>SET_TEXT_VIEW_DEFAULT_PARAM_NAME</name>
+        <value>
+          <boolean>true</boolean>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
+    <typeSystemDescription>
+      <imports>
+        <import name="MarkupAnnotationTypeSystem"/>
+      </imports>
+    </typeSystemDescription>
+    <typePriorities/>
+    <fsIndexCollection/>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs>
+          <type allAnnotatorFeatures="true">org.apache.uima.MarkupAnnotation</type>
+        </outputs>
+        <languagesSupported>
+          <language>x-unspecified</language>
+        </languagesSupported>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+      <outputsNewCASes>true</outputsNewCASes>
+    </operationalProperties>
+  </analysisEngineMetaData>
+  <externalResourceDependencies>
+    <externalResourceDependency>
+      <key>tikaConfigFile</key>
+      <description>XML configuration file for Tika</description>
+      <optional>true</optional>
+    </externalResourceDependency>
+  </externalResourceDependencies>
+  <resourceManagerConfiguration>
+    <externalResources>
+      <externalResource>
+        <name>tikaConfigFile</name>
+        <description>XMLconfig file for Tika. If not found the component will rely on the default config</description>
+        <fileResourceSpecifier>
+          <fileUrl>tika_config.xml</fileUrl>
+        </fileResourceSpecifier>
+      </externalResource>
+    </externalResources>
+    <externalResourceBindings>
+      <externalResourceBinding>
+        <key>tikaConfigFile</key>
+        <resourceName>tikaConfigFile</resourceName>
+      </externalResourceBinding>
+    </externalResourceBindings>
+  </resourceManagerConfiguration>
+</analysisEngineDescription>

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS.java Fri Jun 12 13:33:07 2009
@@ -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.
- */
 
-package org.apache.uima;
+
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas; 
 import org.apache.uima.jcas.JCasRegistry;
@@ -27,8 +11,8 @@
 
 
 /** Representation of an attribute
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
- * XML source: /data/gate-plugins/UIMAAnnotationReader/desc/MarkupAnnotationTypeSystem.xml
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
+ * XML source: C:/code/uima/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
  * @generated */
 public class AttributeFS extends TOP {
   /** @generated
@@ -74,14 +58,14 @@
    * @generated */
   public String getLocalName() {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_localName == null)
-      jcasType.jcas.throwFeatMissing("localName", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("localName", "org.apache.uima.tika.AttributeFS");
     return jcasType.ll_cas.ll_getStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_localName);}
     
   /** setter for localName - sets  
    * @generated */
   public void setLocalName(String v) {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_localName == null)
-      jcasType.jcas.throwFeatMissing("localName", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("localName", "org.apache.uima.tika.AttributeFS");
     jcasType.ll_cas.ll_setStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_localName, v);}    
    
     
@@ -92,14 +76,14 @@
    * @generated */
   public String getQualifiedName() {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_qualifiedName == null)
-      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.AttributeFS");
     return jcasType.ll_cas.ll_getStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_qualifiedName);}
     
   /** setter for qualifiedName - sets  
    * @generated */
   public void setQualifiedName(String v) {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_qualifiedName == null)
-      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.AttributeFS");
     jcasType.ll_cas.ll_setStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_qualifiedName, v);}    
    
     
@@ -110,14 +94,14 @@
    * @generated */
   public String getUri() {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.AttributeFS");
     return jcasType.ll_cas.ll_getStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_uri);}
     
   /** setter for uri - sets  
    * @generated */
   public void setUri(String v) {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.AttributeFS");
     jcasType.ll_cas.ll_setStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_uri, v);}    
    
     
@@ -128,14 +112,14 @@
    * @generated */
   public String getValue() {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_value == null)
-      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.tika.AttributeFS");
     return jcasType.ll_cas.ll_getStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_value);}
     
   /** setter for value - sets  
    * @generated */
   public void setValue(String v) {
     if (AttributeFS_Type.featOkTst && ((AttributeFS_Type)jcasType).casFeat_value == null)
-      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.AttributeFS");
+      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.tika.AttributeFS");
     jcasType.ll_cas.ll_setStringValue(addr, ((AttributeFS_Type)jcasType).casFeatCode_value, v);}    
   }
 

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS_Type.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS_Type.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/AttributeFS_Type.java Fri Jun 12 13:33:07 2009
@@ -1,23 +1,6 @@
-/*
- * 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;
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
@@ -31,7 +14,7 @@
 import org.apache.uima.jcas.cas.TOP_Type;
 
 /** Representation of an attribute
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
  * @generated */
 public class AttributeFS_Type extends TOP_Type {
   /** @generated */
@@ -56,7 +39,7 @@
   public final static int typeIndexID = AttributeFS.typeIndexID;
   /** @generated 
      @modifiable */
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.AttributeFS");
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.tika.AttributeFS");
  
   /** @generated */
   final Feature casFeat_localName;
@@ -65,13 +48,13 @@
   /** @generated */ 
   public String getLocalName(int addr) {
         if (featOkTst && casFeat_localName == null)
-      jcas.throwFeatMissing("localName", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("localName", "org.apache.uima.tika.AttributeFS");
     return ll_cas.ll_getStringValue(addr, casFeatCode_localName);
   }
   /** @generated */    
   public void setLocalName(int addr, String v) {
         if (featOkTst && casFeat_localName == null)
-      jcas.throwFeatMissing("localName", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("localName", "org.apache.uima.tika.AttributeFS");
     ll_cas.ll_setStringValue(addr, casFeatCode_localName, v);}
     
   
@@ -83,13 +66,13 @@
   /** @generated */ 
   public String getQualifiedName(int addr) {
         if (featOkTst && casFeat_qualifiedName == null)
-      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.AttributeFS");
     return ll_cas.ll_getStringValue(addr, casFeatCode_qualifiedName);
   }
   /** @generated */    
   public void setQualifiedName(int addr, String v) {
         if (featOkTst && casFeat_qualifiedName == null)
-      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.AttributeFS");
     ll_cas.ll_setStringValue(addr, casFeatCode_qualifiedName, v);}
     
   
@@ -101,13 +84,13 @@
   /** @generated */ 
   public String getUri(int addr) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.AttributeFS");
     return ll_cas.ll_getStringValue(addr, casFeatCode_uri);
   }
   /** @generated */    
   public void setUri(int addr, String v) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.AttributeFS");
     ll_cas.ll_setStringValue(addr, casFeatCode_uri, v);}
     
   
@@ -119,13 +102,13 @@
   /** @generated */ 
   public String getValue(int addr) {
         if (featOkTst && casFeat_value == null)
-      jcas.throwFeatMissing("value", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("value", "org.apache.uima.tika.AttributeFS");
     return ll_cas.ll_getStringValue(addr, casFeatCode_value);
   }
   /** @generated */    
   public void setValue(int addr, String v) {
         if (featOkTst && casFeat_value == null)
-      jcas.throwFeatMissing("value", "org.apache.uima.AttributeFS");
+      jcas.throwFeatMissing("value", "org.apache.uima.tika.AttributeFS");
     ll_cas.ll_setStringValue(addr, casFeatCode_value, v);}
     
   

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue.java Fri Jun 12 13:33:07 2009
@@ -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.
- */
 
-package org.apache.uima;
+
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas; 
 import org.apache.uima.jcas.JCasRegistry;
@@ -27,8 +11,8 @@
 
 
 /** Simple Feature Value
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
- * XML source: /data/gate-plugins/UIMAAnnotationReader/desc/MarkupAnnotationTypeSystem.xml
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
+ * XML source: C:/code/uima/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
  * @generated */
 public class FeatureValue extends TOP {
   /** @generated
@@ -74,14 +58,14 @@
    * @generated */
   public String getName() {
     if (FeatureValue_Type.featOkTst && ((FeatureValue_Type)jcasType).casFeat_name == null)
-      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.FeatureValue");
+      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.tika.FeatureValue");
     return jcasType.ll_cas.ll_getStringValue(addr, ((FeatureValue_Type)jcasType).casFeatCode_name);}
     
   /** setter for name - sets name of the feature 
    * @generated */
   public void setName(String v) {
     if (FeatureValue_Type.featOkTst && ((FeatureValue_Type)jcasType).casFeat_name == null)
-      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.FeatureValue");
+      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.tika.FeatureValue");
     jcasType.ll_cas.ll_setStringValue(addr, ((FeatureValue_Type)jcasType).casFeatCode_name, v);}    
    
     
@@ -92,14 +76,14 @@
    * @generated */
   public String getValue() {
     if (FeatureValue_Type.featOkTst && ((FeatureValue_Type)jcasType).casFeat_value == null)
-      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.FeatureValue");
+      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.tika.FeatureValue");
     return jcasType.ll_cas.ll_getStringValue(addr, ((FeatureValue_Type)jcasType).casFeatCode_value);}
     
   /** setter for value - sets  
    * @generated */
   public void setValue(String v) {
     if (FeatureValue_Type.featOkTst && ((FeatureValue_Type)jcasType).casFeat_value == null)
-      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.FeatureValue");
+      jcasType.jcas.throwFeatMissing("value", "org.apache.uima.tika.FeatureValue");
     jcasType.ll_cas.ll_setStringValue(addr, ((FeatureValue_Type)jcasType).casFeatCode_value, v);}    
   }
 

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue_Type.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue_Type.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/FeatureValue_Type.java Fri Jun 12 13:33:07 2009
@@ -1,23 +1,6 @@
-/*
- * 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;
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
@@ -31,7 +14,7 @@
 import org.apache.uima.jcas.cas.TOP_Type;
 
 /** Simple Feature Value
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
  * @generated */
 public class FeatureValue_Type extends TOP_Type {
   /** @generated */
@@ -56,7 +39,7 @@
   public final static int typeIndexID = FeatureValue.typeIndexID;
   /** @generated 
      @modifiable */
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.FeatureValue");
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.tika.FeatureValue");
  
   /** @generated */
   final Feature casFeat_name;
@@ -65,13 +48,13 @@
   /** @generated */ 
   public String getName(int addr) {
         if (featOkTst && casFeat_name == null)
-      jcas.throwFeatMissing("name", "org.apache.uima.FeatureValue");
+      jcas.throwFeatMissing("name", "org.apache.uima.tika.FeatureValue");
     return ll_cas.ll_getStringValue(addr, casFeatCode_name);
   }
   /** @generated */    
   public void setName(int addr, String v) {
         if (featOkTst && casFeat_name == null)
-      jcas.throwFeatMissing("name", "org.apache.uima.FeatureValue");
+      jcas.throwFeatMissing("name", "org.apache.uima.tika.FeatureValue");
     ll_cas.ll_setStringValue(addr, casFeatCode_name, v);}
     
   
@@ -83,13 +66,13 @@
   /** @generated */ 
   public String getValue(int addr) {
         if (featOkTst && casFeat_value == null)
-      jcas.throwFeatMissing("value", "org.apache.uima.FeatureValue");
+      jcas.throwFeatMissing("value", "org.apache.uima.tika.FeatureValue");
     return ll_cas.ll_getStringValue(addr, casFeatCode_value);
   }
   /** @generated */    
   public void setValue(int addr, String v) {
         if (featOkTst && casFeat_value == null)
-      jcas.throwFeatMissing("value", "org.apache.uima.FeatureValue");
+      jcas.throwFeatMissing("value", "org.apache.uima.tika.FeatureValue");
     ll_cas.ll_setStringValue(addr, casFeatCode_value, v);}
     
   

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation.java Fri Jun 12 13:33:07 2009
@@ -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.
- */
 
-package org.apache.uima;
+
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas; 
 import org.apache.uima.jcas.JCasRegistry;
@@ -28,8 +12,8 @@
 
 
 /** 
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
- * XML source: /data/gate-plugins/UIMAAnnotationReader/desc/MarkupAnnotationTypeSystem.xml
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
+ * XML source: C:/code/uima/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
  * @generated */
 public class MarkupAnnotation extends Annotation {
   /** @generated
@@ -83,21 +67,21 @@
    * @generated */
   public FSArray getAttributes() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_attributes == null)
-      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     return (FSArray)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes)));}
     
   /** setter for attributes - sets  
    * @generated */
   public void setAttributes(FSArray v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_attributes == null)
-      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes, jcasType.ll_cas.ll_getFSRef(v));}    
     
   /** indexed getter for attributes - gets an indexed value - 
    * @generated */
   public FSArray getAttributes(int i) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_attributes == null)
-      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes), i);
     return (FSArray)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes), i)));}
 
@@ -105,7 +89,7 @@
    * @generated */
   public void setAttributes(int i, FSArray v) { 
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_attributes == null)
-      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes), i);
     jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_attributes), i, jcasType.ll_cas.ll_getFSRef(v));}
    
@@ -117,21 +101,21 @@
    * @generated */
   public FSArray getChildren() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_children == null)
-      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     return (FSArray)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children)));}
     
   /** setter for children - sets  
    * @generated */
   public void setChildren(FSArray v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_children == null)
-      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children, jcasType.ll_cas.ll_getFSRef(v));}    
     
   /** indexed getter for children - gets an indexed value - 
    * @generated */
   public MarkupAnnotation getChildren(int i) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_children == null)
-      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children), i);
     return (MarkupAnnotation)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children), i)));}
 
@@ -139,7 +123,7 @@
    * @generated */
   public void setChildren(int i, MarkupAnnotation v) { 
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_children == null)
-      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children), i);
     jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_children), i, jcasType.ll_cas.ll_getFSRef(v));}
    
@@ -151,14 +135,14 @@
    * @generated */
   public String getName() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_name == null)
-      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.tika.MarkupAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_name);}
     
   /** setter for name - sets  
    * @generated */
   public void setName(String v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_name == null)
-      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("name", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_name, v);}    
    
     
@@ -169,14 +153,14 @@
    * @generated */
   public MarkupAnnotation getParent() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_parent == null)
-      jcasType.jcas.throwFeatMissing("parent", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("parent", "org.apache.uima.tika.MarkupAnnotation");
     return (MarkupAnnotation)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_parent)));}
     
   /** setter for parent - sets  
    * @generated */
   public void setParent(MarkupAnnotation v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_parent == null)
-      jcasType.jcas.throwFeatMissing("parent", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("parent", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setRefValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_parent, jcasType.ll_cas.ll_getFSRef(v));}    
    
     
@@ -187,14 +171,14 @@
    * @generated */
   public String getQualifiedName() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_qualifiedName == null)
-      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.MarkupAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_qualifiedName);}
     
   /** setter for qualifiedName - sets  
    * @generated */
   public void setQualifiedName(String v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_qualifiedName == null)
-      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_qualifiedName, v);}    
    
     
@@ -205,14 +189,14 @@
    * @generated */
   public String getUri() {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.MarkupAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_uri);}
     
   /** setter for uri - sets  
    * @generated */
   public void setUri(String v) {
     if (MarkupAnnotation_Type.featOkTst && ((MarkupAnnotation_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.MarkupAnnotation");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.MarkupAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((MarkupAnnotation_Type)jcasType).casFeatCode_uri, v);}    
   }
 

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation_Type.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation_Type.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotation_Type.java Fri Jun 12 13:33:07 2009
@@ -1,23 +1,6 @@
-/*
- * 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;
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
@@ -31,7 +14,7 @@
 import org.apache.uima.jcas.tcas.Annotation_Type;
 
 /** 
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
  * @generated */
 public class MarkupAnnotation_Type extends Annotation_Type {
   /** @generated */
@@ -56,7 +39,7 @@
   public final static int typeIndexID = MarkupAnnotation.typeIndexID;
   /** @generated 
      @modifiable */
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.MarkupAnnotation");
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.tika.MarkupAnnotation");
  
   /** @generated */
   final Feature casFeat_attributes;
@@ -65,19 +48,19 @@
   /** @generated */ 
   public int getAttributes(int addr) {
         if (featOkTst && casFeat_attributes == null)
-      jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getRefValue(addr, casFeatCode_attributes);
   }
   /** @generated */    
   public void setAttributes(int addr, int v) {
         if (featOkTst && casFeat_attributes == null)
-      jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setRefValue(addr, casFeatCode_attributes, v);}
     
    /** @generated */
   public int getAttributes(int addr, int i) {
         if (featOkTst && casFeat_attributes == null)
-      jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_attributes), i, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_attributes), i);
@@ -87,7 +70,7 @@
   /** @generated */ 
   public void setAttributes(int addr, int i, int v) {
         if (featOkTst && casFeat_attributes == null)
-      jcas.throwFeatMissing("attributes", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("attributes", "org.apache.uima.tika.MarkupAnnotation");
     if (lowLevelTypeChecks)
       ll_cas.ll_setRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_attributes), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_attributes), i);
@@ -102,19 +85,19 @@
   /** @generated */ 
   public int getChildren(int addr) {
         if (featOkTst && casFeat_children == null)
-      jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getRefValue(addr, casFeatCode_children);
   }
   /** @generated */    
   public void setChildren(int addr, int v) {
         if (featOkTst && casFeat_children == null)
-      jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setRefValue(addr, casFeatCode_children, v);}
     
    /** @generated */
   public int getChildren(int addr, int i) {
         if (featOkTst && casFeat_children == null)
-      jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_children), i, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_children), i);
@@ -124,7 +107,7 @@
   /** @generated */ 
   public void setChildren(int addr, int i, int v) {
         if (featOkTst && casFeat_children == null)
-      jcas.throwFeatMissing("children", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("children", "org.apache.uima.tika.MarkupAnnotation");
     if (lowLevelTypeChecks)
       ll_cas.ll_setRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_children), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_children), i);
@@ -139,13 +122,13 @@
   /** @generated */ 
   public String getName(int addr) {
         if (featOkTst && casFeat_name == null)
-      jcas.throwFeatMissing("name", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("name", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_name);
   }
   /** @generated */    
   public void setName(int addr, String v) {
         if (featOkTst && casFeat_name == null)
-      jcas.throwFeatMissing("name", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("name", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_name, v);}
     
   
@@ -157,13 +140,13 @@
   /** @generated */ 
   public int getParent(int addr) {
         if (featOkTst && casFeat_parent == null)
-      jcas.throwFeatMissing("parent", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("parent", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getRefValue(addr, casFeatCode_parent);
   }
   /** @generated */    
   public void setParent(int addr, int v) {
         if (featOkTst && casFeat_parent == null)
-      jcas.throwFeatMissing("parent", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("parent", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setRefValue(addr, casFeatCode_parent, v);}
     
   
@@ -175,13 +158,13 @@
   /** @generated */ 
   public String getQualifiedName(int addr) {
         if (featOkTst && casFeat_qualifiedName == null)
-      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_qualifiedName);
   }
   /** @generated */    
   public void setQualifiedName(int addr, String v) {
         if (featOkTst && casFeat_qualifiedName == null)
-      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("qualifiedName", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_qualifiedName, v);}
     
   
@@ -193,13 +176,13 @@
   /** @generated */ 
   public String getUri(int addr) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.MarkupAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_uri);
   }
   /** @generated */    
   public void setUri(int addr, String v) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.MarkupAnnotation");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.MarkupAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_uri, v);}
     
   
@@ -225,7 +208,7 @@
     casFeatCode_name  = (null == casFeat_name) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_name).getCode();
 
  
-    casFeat_parent = jcas.getRequiredFeatureDE(casType, "parent", "org.apache.uima.MarkupAnnotation", featOkTst);
+    casFeat_parent = jcas.getRequiredFeatureDE(casType, "parent", "org.apache.uima.tika.MarkupAnnotation", featOkTst);
     casFeatCode_parent  = (null == casFeat_parent) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_parent).getCode();
 
  

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotator.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotator.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupAnnotator.java Fri Jun 12 13:33:07 2009
@@ -29,8 +29,6 @@
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.Parser;
-import org.apache.uima.FeatureValue;
-import org.apache.uima.SourceDocumentAnnotation;
 import org.apache.uima.UimaContext;
 import org.apache.uima.analysis_component.CasAnnotator_ImplBase;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupHandler.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupHandler.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupHandler.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/MarkupHandler.java Fri Jun 12 13:33:07 2009
@@ -23,8 +23,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.uima.AttributeFS;
-import org.apache.uima.MarkupAnnotation;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.CASException;
 import org.apache.uima.cas.Type;
@@ -164,7 +162,7 @@
 			Attributes protoAttributes = proto.getAtts();
 			FSArray attribs = (FSArray) cas.createArrayFS(protoAttributes.getLength());
 			for (int index=0; index< protoAttributes.getLength();index++){
-				org.apache.uima.AttributeFS afs = (AttributeFS) cas.createFS(attributeType);
+				org.apache.uima.tika.AttributeFS afs = (AttributeFS) cas.createFS(attributeType);
 				afs.setLocalName(protoAttributes.getLocalName(index));
 				afs.setQualifiedName(protoAttributes.getQName(index));
 				afs.setUri(protoAttributes.getURI(index));

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation.java Fri Jun 12 13:33:07 2009
@@ -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.
- */
 
-package org.apache.uima;
+
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas; 
 import org.apache.uima.jcas.JCasRegistry;
@@ -28,8 +12,8 @@
 
 
 /** 
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
- * XML source: /data/gate-plugins/UIMAAnnotationReader/desc/MarkupAnnotationTypeSystem.xml
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
+ * XML source: C:/code/uima/TikaAnnotator/desc/MarkupAnnotationTypeSystem.xml
  * @generated */
 public class SourceDocumentAnnotation extends DocumentAnnotation {
   /** @generated
@@ -83,14 +67,14 @@
    * @generated */
   public String getUri() {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.SourceDocumentAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_uri);}
     
   /** setter for uri - sets  
    * @generated */
   public void setUri(String v) {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_uri == null)
-      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("uri", "org.apache.uima.tika.SourceDocumentAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_uri, v);}    
    
     
@@ -101,14 +85,14 @@
    * @generated */
   public String getContentType() {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_contentType == null)
-      jcasType.jcas.throwFeatMissing("contentType", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("contentType", "org.apache.uima.tika.SourceDocumentAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_contentType);}
     
   /** setter for contentType - sets  
    * @generated */
   public void setContentType(String v) {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_contentType == null)
-      jcasType.jcas.throwFeatMissing("contentType", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("contentType", "org.apache.uima.tika.SourceDocumentAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_contentType, v);}    
    
     
@@ -119,21 +103,21 @@
    * @generated */
   public FSArray getFeatures() {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_features == null)
-      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     return (FSArray)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features)));}
     
   /** setter for features - sets  
    * @generated */
   public void setFeatures(FSArray v) {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_features == null)
-      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     jcasType.ll_cas.ll_setRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features, jcasType.ll_cas.ll_getFSRef(v));}    
     
   /** indexed getter for features - gets an indexed value - 
    * @generated */
   public FeatureValue getFeatures(int i) {
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_features == null)
-      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features), i);
     return (FeatureValue)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features), i)));}
 
@@ -141,7 +125,7 @@
    * @generated */
   public void setFeatures(int i, FeatureValue v) { 
     if (SourceDocumentAnnotation_Type.featOkTst && ((SourceDocumentAnnotation_Type)jcasType).casFeat_features == null)
-      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcasType.jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features), i);
     jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((SourceDocumentAnnotation_Type)jcasType).casFeatCode_features), i, jcasType.ll_cas.ll_getFSRef(v));}
   }

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation_Type.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation_Type.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/SourceDocumentAnnotation_Type.java Fri Jun 12 13:33:07 2009
@@ -1,23 +1,6 @@
-/*
- * 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;
+/* First created by JCasGen Fri Jun 12 15:31:15 CEST 2009 */
+package org.apache.uima.tika;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
@@ -31,7 +14,7 @@
 import org.apache.uima.jcas.tcas.DocumentAnnotation_Type;
 
 /** 
- * Updated by JCasGen Thu Sep 18 08:31:44 BST 2008
+ * Updated by JCasGen Fri Jun 12 15:31:15 CEST 2009
  * @generated */
 public class SourceDocumentAnnotation_Type extends DocumentAnnotation_Type {
   /** @generated */
@@ -56,7 +39,7 @@
   public final static int typeIndexID = SourceDocumentAnnotation.typeIndexID;
   /** @generated 
      @modifiable */
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.SourceDocumentAnnotation");
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("org.apache.uima.tika.SourceDocumentAnnotation");
  
   /** @generated */
   final Feature casFeat_uri;
@@ -65,13 +48,13 @@
   /** @generated */ 
   public String getUri(int addr) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.SourceDocumentAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_uri);
   }
   /** @generated */    
   public void setUri(int addr, String v) {
         if (featOkTst && casFeat_uri == null)
-      jcas.throwFeatMissing("uri", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("uri", "org.apache.uima.tika.SourceDocumentAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_uri, v);}
     
   
@@ -83,13 +66,13 @@
   /** @generated */ 
   public String getContentType(int addr) {
         if (featOkTst && casFeat_contentType == null)
-      jcas.throwFeatMissing("contentType", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("contentType", "org.apache.uima.tika.SourceDocumentAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_contentType);
   }
   /** @generated */    
   public void setContentType(int addr, String v) {
         if (featOkTst && casFeat_contentType == null)
-      jcas.throwFeatMissing("contentType", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("contentType", "org.apache.uima.tika.SourceDocumentAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_contentType, v);}
     
   
@@ -101,19 +84,19 @@
   /** @generated */ 
   public int getFeatures(int addr) {
         if (featOkTst && casFeat_features == null)
-      jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     return ll_cas.ll_getRefValue(addr, casFeatCode_features);
   }
   /** @generated */    
   public void setFeatures(int addr, int v) {
         if (featOkTst && casFeat_features == null)
-      jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     ll_cas.ll_setRefValue(addr, casFeatCode_features, v);}
     
    /** @generated */
   public int getFeatures(int addr, int i) {
         if (featOkTst && casFeat_features == null)
-      jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_features), i, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_features), i);
@@ -123,7 +106,7 @@
   /** @generated */ 
   public void setFeatures(int addr, int i, int v) {
         if (featOkTst && casFeat_features == null)
-      jcas.throwFeatMissing("features", "org.apache.uima.SourceDocumentAnnotation");
+      jcas.throwFeatMissing("features", "org.apache.uima.tika.SourceDocumentAnnotation");
     if (lowLevelTypeChecks)
       ll_cas.ll_setRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_features), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_features), i);

Modified: incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/TIKAWrapper.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/TIKAWrapper.java?rev=784113&r1=784112&r2=784113&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/TIKAWrapper.java (original)
+++ incubator/uima/sandbox/trunk/TikaAnnotator/src/main/java/org/apache/uima/tika/TIKAWrapper.java Fri Jun 12 13:33:07 2009
@@ -29,8 +29,6 @@
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.Parser;
-import org.apache.uima.FeatureValue;
-import org.apache.uima.SourceDocumentAnnotation;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.CASException;
 import org.apache.uima.jcas.JCas;