You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2015/04/25 17:24:29 UTC

svn commit: r1676027 [2/3] - in /uima/ruta/trunk/example-projects: ExampleProject/ ExampleProject/descriptor/ ExampleProject/descriptor/uima/ruta/example/ ExampleProject/descriptor/utils/ ExtensionsExample/ ExtensionsExample/descriptor/ ExtensionsExamp...

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionEngine.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionEngine.xml Sat Apr 25 15:24:27 2015
@@ -163,6 +163,24 @@
                 <multiValued>false</multiValued>
                 <mandatory>false</mandatory>
             </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
         </configurationParameters>
         <configurationParameterSettings>
             <nameValuePair>
@@ -188,7 +206,6 @@
                 <value>
                     <array>
                         <string>org.apache.uima.ruta.type.SPACE</string>
-                        <string>org.apache.uima.ruta.type.NBSP</string>
                         <string>org.apache.uima.ruta.type.BREAK</string>
                         <string>org.apache.uima.ruta.type.MARKUP</string>
                     </array>
@@ -217,14 +234,14 @@
             <nameValuePair>
                 <name>mainScript</name>
                 <value>
-                    <string>uima.ruta.example.ExampleStringFunction</string>
+                    <string>ExampleStringFunction</string>
                 </value>
             </nameValuePair>
             <nameValuePair>
                 <name>scriptPaths</name>
                 <value>
                     <array>
-                        <string>D:/work/workspace-ruta/ExtensionsExample/script</string>
+                        <string>D:/work/ws-tutorial/ExtensionsExample/script</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -232,7 +249,7 @@
                 <name>descriptorPaths</name>
                 <value>
                     <array>
-                        <string>D:/work/workspace-ruta/ExtensionsExample/descriptor</string>
+                        <string>D:/work/ws-tutorial/ExtensionsExample/descriptor</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -240,7 +257,7 @@
                 <name>resourcePaths</name>
                 <value>
                     <array>
-                        <string>D:\work\workspace-ruta\ExtensionsExample\resources</string>
+                        <string>D:\work\ws-tutorial\ExtensionsExample\resources</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -268,12 +285,16 @@
                     <array>
                         <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
+                        <string>org.apache.uima.ruta.string.bool.BooleanOperationsExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
+                        <string>org.apache.uima.ruta.string.StringOperationsExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyOnceBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.fst.FSTBlockExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
-                        <string>org.apache.uima.ruta.extension.fst.FSTBlockExtension</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -285,27 +306,9 @@
             </nameValuePair>
         </configurationParameterSettings>
         <typeSystemDescription>
-            <name>uima.ruta.example.ExampleStringFunctionTypeSystem</name>
             <imports>
-                <import location="../../../BasicTypeSystem.xml"/>
+                <import location="ExampleStringFunctionTypeSystem.xml"/>
             </imports>
-            <types>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleStringFunction.T1</name>
-                    <description>Type defined in uima.ruta.example.ExampleStringFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleStringFunction.T2</name>
-                    <description>Type defined in uima.ruta.example.ExampleStringFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleStringFunction.T3</name>
-                    <description>Type defined in uima.ruta.example.ExampleStringFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-            </types>
         </typeSystemDescription>
         <typePriorities>
             <priorityList>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleStringFunctionTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-    <name>uima.ruta.example.ExampleStringFunctionTypeSystem</name>
+    <name>ExampleStringFunctionTypeSystem</name>
     <imports>
-        <import location="../../../BasicTypeSystem.xml"/>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
     </imports>
     <types>
         <typeDescription>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionEngine.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionEngine.xml Sat Apr 25 15:24:27 2015
@@ -163,6 +163,24 @@
                 <multiValued>false</multiValued>
                 <mandatory>false</mandatory>
             </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
         </configurationParameters>
         <configurationParameterSettings>
             <nameValuePair>
@@ -188,7 +206,6 @@
                 <value>
                     <array>
                         <string>org.apache.uima.ruta.type.SPACE</string>
-                        <string>org.apache.uima.ruta.type.NBSP</string>
                         <string>org.apache.uima.ruta.type.BREAK</string>
                         <string>org.apache.uima.ruta.type.MARKUP</string>
                     </array>
@@ -217,14 +234,14 @@
             <nameValuePair>
                 <name>mainScript</name>
                 <value>
-                    <string>uima.ruta.example.ExampleTypeFunction</string>
+                    <string>ExampleTypeFunction</string>
                 </value>
             </nameValuePair>
             <nameValuePair>
                 <name>scriptPaths</name>
                 <value>
                     <array>
-                        <string>D:/work/workspace-ruta/ExtensionsExample/script</string>
+                        <string>D:/work/ws-tutorial/ExtensionsExample/script</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -232,7 +249,7 @@
                 <name>descriptorPaths</name>
                 <value>
                     <array>
-                        <string>D:/work/workspace-ruta/ExtensionsExample/descriptor</string>
+                        <string>D:/work/ws-tutorial/ExtensionsExample/descriptor</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -240,7 +257,7 @@
                 <name>resourcePaths</name>
                 <value>
                     <array>
-                        <string>D:\work\workspace-ruta\ExtensionsExample\resources</string>
+                        <string>D:\work\ws-tutorial\ExtensionsExample\resources</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -268,12 +285,16 @@
                     <array>
                         <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
+                        <string>org.apache.uima.ruta.string.bool.BooleanOperationsExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
+                        <string>org.apache.uima.ruta.string.StringOperationsExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyOnceBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.fst.FSTBlockExtension</string>
                         <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
-                        <string>org.apache.uima.ruta.extension.fst.FSTBlockExtension</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -285,27 +306,9 @@
             </nameValuePair>
         </configurationParameterSettings>
         <typeSystemDescription>
-            <name>uima.ruta.example.ExampleTypeFunctionTypeSystem</name>
             <imports>
-                <import location="../../../BasicTypeSystem.xml"/>
+                <import location="ExampleTypeFunctionTypeSystem.xml"/>
             </imports>
-            <types>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleTypeFunction.T1</name>
-                    <description>Type defined in uima.ruta.example.ExampleTypeFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleTypeFunction.T2</name>
-                    <description>Type defined in uima.ruta.example.ExampleTypeFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>uima.ruta.example.ExampleTypeFunction.T3</name>
-                    <description>Type defined in uima.ruta.example.ExampleTypeFunction</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-            </types>
         </typeSystemDescription>
         <typePriorities>
             <priorityList>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/uima/ruta/example/ExampleTypeFunctionTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-    <name>uima.ruta.example.ExampleTypeFunctionTypeSystem</name>
+    <name>ExampleTypeFunctionTypeSystem</name>
     <imports>
-        <import location="../../../BasicTypeSystem.xml"/>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
     </imports>
     <types>
         <typeDescription>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlConverter.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlConverter.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlConverter.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlConverter.xml Sat Apr 25 15:24:27 2015
@@ -40,6 +40,12 @@
         <mandatory>false</mandatory>
       </configurationParameter>
       <configurationParameter>
+        <name>newlineInducingTagRegExp</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
         <name>replaceLinebreaks</name>
         <type>Boolean</type>
         <multiValued>false</multiValued>
@@ -77,8 +83,27 @@ Defaults to heuristic.</description>
         <multiValued>true</multiValued>
         <mandatory>false</mandatory>
       </configurationParameter>
+    <configurationParameter>
+        <name>skipWhitespaces</name>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+    <configurationParameter>
+        <name>processAll</name>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
     </configurationParameters>
-    <configurationParameterSettings/>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>skipWhitespaces</name>
+        <value>
+          <boolean>true</boolean>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
     <typeSystemDescription/>
     <typePriorities/>
     <fsIndexCollection/>
@@ -96,4 +121,4 @@ Defaults to heuristic.</description>
     </operationalProperties>
   </analysisEngineMetaData>
   <resourceManagerConfiguration/>
-</analysisEngineDescription>
\ No newline at end of file
+</analysisEngineDescription>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/HtmlTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -35,6 +35,11 @@
           <rangeTypeName>uima.cas.String</rangeTypeName>
         </featureDescription>
         <featureDescription>
+          <name>expandedOffsets</name>
+          <description></description>
+          <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
           <name>attributeName</name>
           <description></description>
           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

Modified: uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/PlainTextTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/PlainTextTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/PlainTextTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/ExtensionsExample/descriptor/utils/PlainTextTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,4 +1,5 @@
 <?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
@@ -17,7 +18,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
   <name>PlainTextTypeSystem</name>
   <description/>
@@ -37,6 +37,11 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.WSLine</name>
       <description/>
+      <supertypeName>org.apache.uima.ruta.type.EmptyLine</supertypeName>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.ruta.type.EmptyLine</name>
+      <description/>
       <supertypeName>org.apache.uima.ruta.type.AnyLine</supertypeName>
     </typeDescription>
     <typeDescription>

Modified: uima/ruta/trunk/example-projects/GermanNovels/.buildpath
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/.buildpath?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/.buildpath (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/.buildpath Sat Apr 25 15:24:27 2015
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
-	<buildpathentry kind="con" path="org.eclipse.dltk.launching.INTERPRETER_CONTAINER"/>
-	<buildpathentry kind="src" path="script"/>
+	<buildpathentry kind="src" path="script">
+		<attributes>
+			<attribute name="ruta" value="script"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="descriptor">
+		<attributes>
+			<attribute name="ruta" value="descriptor"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="resources">
+		<attributes>
+			<attribute name="ruta" value="resources"/>
+		</attributes>
+	</buildpathentry>
 </buildpath>

Modified: uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicEngine.xml (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicEngine.xml Sat Apr 25 15:24:27 2015
@@ -1,5 +1,4 @@
 <?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
@@ -181,6 +180,24 @@
         <multiValued>false</multiValued>
         <mandatory>false</mandatory>
       </configurationParameter>
+      <configurationParameter>
+        <name>varNames</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>varValues</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>rules</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>
       <nameValuePair>
@@ -206,7 +223,6 @@
         <value>
           <array>
             <string>org.apache.uima.ruta.type.SPACE</string>
-            <string>org.apache.uima.ruta.type.NBSP</string>
             <string>org.apache.uima.ruta.type.BREAK</string>
             <string>org.apache.uima.ruta.type.MARKUP</string>
           </array>

Modified: uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/descriptor/BasicTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -120,7 +120,7 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.NBSP</name>
       <description/>
-      <supertypeName>org.apache.uima.ruta.type.ANY</supertypeName>
+      <supertypeName>org.apache.uima.ruta.type.SPACE</supertypeName>
     </typeDescription>
     <typeDescription>
       <name>org.apache.uima.ruta.type.AMP</name>

Modified: uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlConverter.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlConverter.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlConverter.xml (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlConverter.xml Sat Apr 25 15:24:27 2015
@@ -1,5 +1,4 @@
 <?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
@@ -41,6 +40,12 @@
         <mandatory>false</mandatory>
       </configurationParameter>
       <configurationParameter>
+        <name>newlineInducingTagRegExp</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
         <name>replaceLinebreaks</name>
         <type>Boolean</type>
         <multiValued>false</multiValued>
@@ -83,6 +88,12 @@ Defaults to heuristic.</description>
         <type>Boolean</type>
         <multiValued>false</multiValued>
         <mandatory>false</mandatory>
+      </configurationParameter>
+    <configurationParameter>
+        <name>processAll</name>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
       </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>

Modified: uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/HtmlTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -35,6 +35,11 @@
           <rangeTypeName>uima.cas.String</rangeTypeName>
         </featureDescription>
         <featureDescription>
+          <name>expandedOffsets</name>
+          <description></description>
+          <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
           <name>attributeName</name>
           <description></description>
           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

Modified: uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/PlainTextTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/PlainTextTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/PlainTextTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/GermanNovels/descriptor/utils/PlainTextTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,4 +1,5 @@
 <?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
@@ -17,7 +18,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
   <name>PlainTextTypeSystem</name>
   <description/>
@@ -37,6 +37,11 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.WSLine</name>
       <description/>
+      <supertypeName>org.apache.uima.ruta.type.EmptyLine</supertypeName>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.ruta.type.EmptyLine</name>
+      <description/>
       <supertypeName>org.apache.uima.ruta.type.AnyLine</supertypeName>
     </typeDescription>
     <typeDescription>

Modified: uima/ruta/trunk/example-projects/Misc/.buildpath
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/.buildpath?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/.buildpath (original)
+++ uima/ruta/trunk/example-projects/Misc/.buildpath Sat Apr 25 15:24:27 2015
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
-	<buildpathentry kind="con" path="org.eclipse.dltk.launching.INTERPRETER_CONTAINER"/>
-	<buildpathentry kind="src" path="script"/>
+	<buildpathentry kind="src" path="script">
+		<attributes>
+			<attribute name="ruta" value="script"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="descriptor">
+		<attributes>
+			<attribute name="ruta" value="descriptor"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="resources">
+		<attributes>
+			<attribute name="ruta" value="resources"/>
+		</attributes>
+	</buildpathentry>
 </buildpath>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/BasicEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/BasicEngine.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/BasicEngine.xml Sat Apr 25 15:24:27 2015
@@ -1,5 +1,4 @@
 <?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
@@ -181,6 +180,24 @@
         <multiValued>false</multiValued>
         <mandatory>false</mandatory>
       </configurationParameter>
+      <configurationParameter>
+        <name>varNames</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>varValues</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>rules</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>
       <nameValuePair>
@@ -206,7 +223,6 @@
         <value>
           <array>
             <string>org.apache.uima.ruta.type.SPACE</string>
-            <string>org.apache.uima.ruta.type.NBSP</string>
             <string>org.apache.uima.ruta.type.BREAK</string>
             <string>org.apache.uima.ruta.type.MARKUP</string>
           </array>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/BasicTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/BasicTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/BasicTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/BasicTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -120,7 +120,7 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.NBSP</name>
       <description/>
-      <supertypeName>org.apache.uima.ruta.type.ANY</supertypeName>
+      <supertypeName>org.apache.uima.ruta.type.SPACE</supertypeName>
     </typeDescription>
     <typeDescription>
       <name>org.apache.uima.ruta.type.AMP</name>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterEngine.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterEngine.xml Sat Apr 25 15:24:27 2015
@@ -163,6 +163,24 @@
                 <multiValued>false</multiValued>
                 <mandatory>false</mandatory>
             </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
         </configurationParameters>
         <configurationParameterSettings>
             <nameValuePair>
@@ -188,7 +206,6 @@
                 <value>
                     <array>
                         <string>org.apache.uima.ruta.type.SPACE</string>
-                        <string>org.apache.uima.ruta.type.NBSP</string>
                         <string>org.apache.uima.ruta.type.BREAK</string>
                         <string>org.apache.uima.ruta.type.MARKUP</string>
                     </array>
@@ -217,14 +234,14 @@
             <nameValuePair>
                 <name>mainScript</name>
                 <value>
-                    <string>uima.ruta.example.HtmlConverter</string>
+                    <string>HtmlConverter</string>
                 </value>
             </nameValuePair>
             <nameValuePair>
                 <name>scriptPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/script</string>
+                        <string>D:/work/ws-tutorial/Misc/script</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -232,7 +249,7 @@
                 <name>descriptorPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/descriptor</string>
+                        <string>D:/work/ws-tutorial/Misc/descriptor</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -240,7 +257,7 @@
                 <name>resourcePaths</name>
                 <value>
                     <array>
-                        <string>C:\Users\pkluegl\Dropbox\ws-coling\Misc\resources</string>
+                        <string>D:\work\ws-tutorial\Misc\resources</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -293,11 +310,8 @@
             </nameValuePair>
         </configurationParameterSettings>
         <typeSystemDescription>
-            <name>uima.ruta.example.HtmlConverterTypeSystem</name>
             <imports>
-                <import location="../../../BasicTypeSystem.xml"/>
-                <import location="../../../utils/HtmlTypeSystem.xml"/>
-                <import location="../../../utils/SourceDocumentInformation.xml"/>
+                <import location="HtmlConverterTypeSystem.xml"/>
             </imports>
         </typeSystemDescription>
         <typePriorities>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/HtmlConverterTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-    <name>uima.ruta.example.HtmlConverterTypeSystem</name>
+    <name>HtmlConverterTypeSystem</name>
     <imports>
-        <import location="../../../BasicTypeSystem.xml"/>
-        <import location="../../../utils/HtmlTypeSystem.xml"/>
-        <import location="../../../utils/SourceDocumentInformation.xml"/>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
+        <import location="..\..\..\utils\HtmlTypeSystem.xml"/>
+        <import location="..\..\..\utils\SourceDocumentInformation.xml"/>
     </imports>
 </typeSystemDescription>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterEngine.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterEngine.xml Sat Apr 25 15:24:27 2015
@@ -163,6 +163,24 @@
                 <multiValued>false</multiValued>
                 <mandatory>false</mandatory>
             </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
         </configurationParameters>
         <configurationParameterSettings>
             <nameValuePair>
@@ -188,7 +206,6 @@
                 <value>
                     <array>
                         <string>org.apache.uima.ruta.type.SPACE</string>
-                        <string>org.apache.uima.ruta.type.NBSP</string>
                         <string>org.apache.uima.ruta.type.BREAK</string>
                         <string>org.apache.uima.ruta.type.MARKUP</string>
                     </array>
@@ -217,14 +234,14 @@
             <nameValuePair>
                 <name>mainScript</name>
                 <value>
-                    <string>uima.ruta.example.Sorter</string>
+                    <string>Sorter</string>
                 </value>
             </nameValuePair>
             <nameValuePair>
                 <name>scriptPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/script</string>
+                        <string>D:/work/ws-tutorial/Misc/script</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -232,7 +249,7 @@
                 <name>descriptorPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/descriptor</string>
+                        <string>D:/work/ws-tutorial/Misc/descriptor</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -240,7 +257,7 @@
                 <name>resourcePaths</name>
                 <value>
                     <array>
-                        <string>C:\Users\pkluegl\Dropbox\ws-coling\Misc\resources</string>
+                        <string>D:\work\ws-tutorial\Misc\resources</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -291,23 +308,9 @@
             </nameValuePair>
         </configurationParameterSettings>
         <typeSystemDescription>
-            <name>uima.ruta.example.SorterTypeSystem</name>
             <imports>
-                <import location="../../../BasicTypeSystem.xml"/>
-                <import location="../../../utils/SourceDocumentInformation.xml"/>
+                <import location="SorterTypeSystem.xml"/>
             </imports>
-            <types>
-                <typeDescription>
-                    <name>Sorter.Pattern</name>
-                    <description>Type defined in null.Sorter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>Sorter.Pattern</name>
-                    <description>Type defined in null.Sorter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-            </types>
         </typeSystemDescription>
         <typePriorities>
             <priorityList>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/SorterTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-    <name>uima.ruta.example.SorterTypeSystem</name>
+    <name>SorterTypeSystem</name>
     <imports>
-        <import location="../../../BasicTypeSystem.xml"/>
-        <import location="../../../utils/SourceDocumentInformation.xml"/>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
+        <import location="..\..\..\utils\SourceDocumentInformation.xml"/>
     </imports>
     <types>
         <typeDescription>
             <name>Sorter.Pattern</name>
-            <description>Type defined in null.Sorter</description>
-            <supertypeName>uima.tcas.Annotation</supertypeName>
-        </typeDescription>
-        <typeDescription>
-            <name>Sorter.Pattern</name>
-            <description>Type defined in null.Sorter</description>
+            <description>Type defined in Sorter</description>
             <supertypeName>uima.tcas.Annotation</supertypeName>
         </typeDescription>
     </types>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterEngine.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterEngine.xml Sat Apr 25 15:24:27 2015
@@ -163,6 +163,24 @@
                 <multiValued>false</multiValued>
                 <mandatory>false</mandatory>
             </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
         </configurationParameters>
         <configurationParameterSettings>
             <nameValuePair>
@@ -188,7 +206,6 @@
                 <value>
                     <array>
                         <string>org.apache.uima.ruta.type.SPACE</string>
-                        <string>org.apache.uima.ruta.type.NBSP</string>
                         <string>org.apache.uima.ruta.type.BREAK</string>
                         <string>org.apache.uima.ruta.type.MARKUP</string>
                     </array>
@@ -217,14 +234,14 @@
             <nameValuePair>
                 <name>mainScript</name>
                 <value>
-                    <string>uima.ruta.example.TEIConverter</string>
+                    <string>TEIConverter</string>
                 </value>
             </nameValuePair>
             <nameValuePair>
                 <name>scriptPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/script</string>
+                        <string>D:/work/ws-tutorial/Misc/script</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -232,7 +249,7 @@
                 <name>descriptorPaths</name>
                 <value>
                     <array>
-                        <string>C:/Users/pkluegl/Dropbox/ws-coling/Misc/descriptor</string>
+                        <string>D:/work/ws-tutorial/Misc/descriptor</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -240,7 +257,7 @@
                 <name>resourcePaths</name>
                 <value>
                     <array>
-                        <string>C:\Users\pkluegl\Dropbox\ws-coling\Misc\resources</string>
+                        <string>D:\work\ws-tutorial\Misc\resources</string>
                     </array>
                 </value>
             </nameValuePair>
@@ -293,54 +310,9 @@
             </nameValuePair>
         </configurationParameterSettings>
         <typeSystemDescription>
-            <name>uima.ruta.example.TEIConverterTypeSystem</name>
             <imports>
-                <import location="../../../BasicTypeSystem.xml"/>
-                <import location="../../../utils/HtmlTypeSystem.xml"/>
-                <import location="../../../utils/SourceDocumentInformation.xml"/>
+                <import location="TEIConverterTypeSystem.xml"/>
             </imports>
-            <types>
-                <typeDescription>
-                    <name>TEIConverter.PersName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.LastName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.FirstName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.AddName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.PersName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.LastName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.FirstName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-                <typeDescription>
-                    <name>TEIConverter.AddName</name>
-                    <description>Type defined in null.TEIConverter</description>
-                    <supertypeName>uima.tcas.Annotation</supertypeName>
-                </typeDescription>
-            </types>
         </typeSystemDescription>
         <typePriorities>
             <priorityList>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/uima/ruta/example/TEIConverterTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,51 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-    <name>uima.ruta.example.TEIConverterTypeSystem</name>
+    <name>TEIConverterTypeSystem</name>
     <imports>
-        <import location="../../../BasicTypeSystem.xml"/>
-        <import location="../../../utils/HtmlTypeSystem.xml"/>
-        <import location="../../../utils/SourceDocumentInformation.xml"/>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
+        <import location="..\..\..\utils\HtmlTypeSystem.xml"/>
+        <import location="..\..\..\utils\SourceDocumentInformation.xml"/>
     </imports>
     <types>
         <typeDescription>
             <name>TEIConverter.PersName</name>
-            <description>Type defined in null.TEIConverter</description>
-            <supertypeName>uima.tcas.Annotation</supertypeName>
-        </typeDescription>
-        <typeDescription>
-            <name>TEIConverter.LastName</name>
-            <description>Type defined in null.TEIConverter</description>
-            <supertypeName>uima.tcas.Annotation</supertypeName>
-        </typeDescription>
-        <typeDescription>
-            <name>TEIConverter.FirstName</name>
-            <description>Type defined in null.TEIConverter</description>
+            <description>Type defined in TEIConverter</description>
             <supertypeName>uima.tcas.Annotation</supertypeName>
         </typeDescription>
         <typeDescription>
             <name>TEIConverter.AddName</name>
-            <description>Type defined in null.TEIConverter</description>
-            <supertypeName>uima.tcas.Annotation</supertypeName>
-        </typeDescription>
-        <typeDescription>
-            <name>TEIConverter.PersName</name>
-            <description>Type defined in null.TEIConverter</description>
+            <description>Type defined in TEIConverter</description>
             <supertypeName>uima.tcas.Annotation</supertypeName>
         </typeDescription>
         <typeDescription>
             <name>TEIConverter.LastName</name>
-            <description>Type defined in null.TEIConverter</description>
+            <description>Type defined in TEIConverter</description>
             <supertypeName>uima.tcas.Annotation</supertypeName>
         </typeDescription>
         <typeDescription>
             <name>TEIConverter.FirstName</name>
-            <description>Type defined in null.TEIConverter</description>
-            <supertypeName>uima.tcas.Annotation</supertypeName>
-        </typeDescription>
-        <typeDescription>
-            <name>TEIConverter.AddName</name>
-            <description>Type defined in null.TEIConverter</description>
+            <description>Type defined in TEIConverter</description>
             <supertypeName>uima.tcas.Annotation</supertypeName>
         </typeDescription>
     </types>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlConverter.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlConverter.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlConverter.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlConverter.xml Sat Apr 25 15:24:27 2015
@@ -1,5 +1,4 @@
 <?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
@@ -41,6 +40,12 @@
         <mandatory>false</mandatory>
       </configurationParameter>
       <configurationParameter>
+        <name>newlineInducingTagRegExp</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
         <name>replaceLinebreaks</name>
         <type>Boolean</type>
         <multiValued>false</multiValued>
@@ -83,6 +88,12 @@ Defaults to heuristic.</description>
         <type>Boolean</type>
         <multiValued>false</multiValued>
         <mandatory>false</mandatory>
+      </configurationParameter>
+    <configurationParameter>
+        <name>processAll</name>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
       </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/utils/HtmlTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -35,6 +35,11 @@
           <rangeTypeName>uima.cas.String</rangeTypeName>
         </featureDescription>
         <featureDescription>
+          <name>expandedOffsets</name>
+          <description></description>
+          <rangeTypeName>uima.cas.Boolean</rangeTypeName>
+        </featureDescription>
+        <featureDescription>
           <name>attributeName</name>
           <description></description>
           <rangeTypeName>uima.cas.StringArray</rangeTypeName>

Modified: uima/ruta/trunk/example-projects/Misc/descriptor/utils/PlainTextTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/Misc/descriptor/utils/PlainTextTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/Misc/descriptor/utils/PlainTextTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/Misc/descriptor/utils/PlainTextTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -1,4 +1,5 @@
 <?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
@@ -17,7 +18,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
   <name>PlainTextTypeSystem</name>
   <description/>
@@ -37,6 +37,11 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.WSLine</name>
       <description/>
+      <supertypeName>org.apache.uima.ruta.type.EmptyLine</supertypeName>
+    </typeDescription>
+    <typeDescription>
+      <name>org.apache.uima.ruta.type.EmptyLine</name>
+      <description/>
       <supertypeName>org.apache.uima.ruta.type.AnyLine</supertypeName>
     </typeDescription>
     <typeDescription>

Modified: uima/ruta/trunk/example-projects/TextRulerExample/.buildpath
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/TextRulerExample/.buildpath?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/TextRulerExample/.buildpath (original)
+++ uima/ruta/trunk/example-projects/TextRulerExample/.buildpath Sat Apr 25 15:24:27 2015
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
-	<buildpathentry kind="con" path="org.eclipse.dltk.launching.INTERPRETER_CONTAINER"/>
-	<buildpathentry kind="src" path="script"/>
+	<buildpathentry kind="src" path="script">
+		<attributes>
+			<attribute name="ruta" value="script"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="descriptor">
+		<attributes>
+			<attribute name="ruta" value="descriptor"/>
+		</attributes>
+	</buildpathentry>
+	<buildpathentry kind="src" path="resources">
+		<attributes>
+			<attribute name="ruta" value="resources"/>
+		</attributes>
+	</buildpathentry>
 </buildpath>

Modified: uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicEngine.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicEngine.xml (original)
+++ uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicEngine.xml Sat Apr 25 15:24:27 2015
@@ -17,7 +17,6 @@
   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>
@@ -132,7 +131,21 @@
       </configurationParameter>
       <configurationParameter>
         <name>dynamicAnchoring</name>
-        <description>Activates dynamic achoring (possible speed up).</description>
+        <description>Activates dynamic anchoring (possible speed up).</description>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>greedyRuleElement</name>
+        <description>Activates greedy anchoring for rule elements.</description>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>greedyRule</name>
+        <description>Activates greedy anchoring for complete rules.</description>
         <type>Boolean</type>
         <multiValued>false</multiValued>
         <mandatory>false</mandatory>
@@ -161,6 +174,30 @@
         <multiValued>true</multiValued>
         <mandatory>false</mandatory>
       </configurationParameter>
+      <configurationParameter>
+        <name>strictImports</name>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>varNames</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>varValues</name>
+        <type>String</type>
+        <multiValued>true</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>rules</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
     </configurationParameters>
     <configurationParameterSettings>
       <nameValuePair>
@@ -186,7 +223,6 @@
         <value>
           <array>
             <string>org.apache.uima.ruta.type.SPACE</string>
-            <string>org.apache.uima.ruta.type.NBSP</string>
             <string>org.apache.uima.ruta.type.BREAK</string>
             <string>org.apache.uima.ruta.type.MARKUP</string>
           </array>

Modified: uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicTypeSystem.xml?rev=1676027&r1=1676026&r2=1676027&view=diff
==============================================================================
--- uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicTypeSystem.xml (original)
+++ uima/ruta/trunk/example-projects/TextRulerExample/descriptor/BasicTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -120,7 +120,7 @@
     <typeDescription>
       <name>org.apache.uima.ruta.type.NBSP</name>
       <description/>
-      <supertypeName>org.apache.uima.ruta.type.ANY</supertypeName>
+      <supertypeName>org.apache.uima.ruta.type.SPACE</supertypeName>
     </typeDescription>
     <typeDescription>
       <name>org.apache.uima.ruta.type.AMP</name>

Added: uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseEngine.xml?rev=1676027&view=auto
==============================================================================
--- uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseEngine.xml (added)
+++ uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseEngine.xml Sat Apr 25 15:24:27 2015
@@ -0,0 +1,335 @@
+<?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.ruta.engine.RutaEngine</annotatorImplementationName>
+    <analysisEngineMetaData>
+        <name>BasicEngine</name>
+        <description/>
+        <version>1.0</version>
+        <vendor/>
+        <configurationParameters searchStrategy="language_fallback">
+            <configurationParameter>
+                <name>seeders</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>debug</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>additionalScripts</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>profile</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>debugWithMatches</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>statistics</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>additionalEngines</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>additionalExtensions</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>debugOnlyFor</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>scriptEncoding</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>additionalEngineLoaders</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>resourcePaths</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>defaultFilteredTypes</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>mainScript</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>scriptPaths</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>descriptorPaths</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>removeBasics</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>dynamicAnchoring</name>
+                <description>Activates dynamic anchoring (possible speed up).</description>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>greedyRuleElement</name>
+                <description>Activates greedy anchoring for rule elements.</description>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>greedyRule</name>
+                <description>Activates greedy anchoring for complete rules.</description>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>lowMemoryProfile</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>createdBy</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>simpleGreedyForComposed</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>additionalUimafitEngines</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>strictImports</name>
+                <type>Boolean</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varNames</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>varValues</name>
+                <type>String</type>
+                <multiValued>true</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+            <configurationParameter>
+                <name>rules</name>
+                <type>String</type>
+                <multiValued>false</multiValued>
+                <mandatory>false</mandatory>
+            </configurationParameter>
+        </configurationParameters>
+        <configurationParameterSettings>
+            <nameValuePair>
+                <name>debug</name>
+                <value>
+                    <boolean>false</boolean>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>profile</name>
+                <value>
+                    <boolean>false</boolean>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>debugWithMatches</name>
+                <value>
+                    <boolean>true</boolean>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>defaultFilteredTypes</name>
+                <value>
+                    <array>
+                        <string>org.apache.uima.ruta.type.SPACE</string>
+                        <string>org.apache.uima.ruta.type.BREAK</string>
+                        <string>org.apache.uima.ruta.type.MARKUP</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>removeBasics</name>
+                <value>
+                    <boolean>false</boolean>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>seeders</name>
+                <value>
+                    <array>
+                        <string>org.apache.uima.ruta.seed.DefaultSeeder</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>createdBy</name>
+                <value>
+                    <boolean>false</boolean>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>mainScript</name>
+                <value>
+                    <string>Base</string>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>scriptPaths</name>
+                <value>
+                    <array>
+                        <string>D:/work/ws-tutorial/TextRulerExample/script</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>descriptorPaths</name>
+                <value>
+                    <array>
+                        <string>D:/work/ws-tutorial/TextRulerExample/descriptor</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>resourcePaths</name>
+                <value>
+                    <array>
+                        <string>D:\work\ws-tutorial\TextRulerExample\resources</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>additionalScripts</name>
+                <value>
+                    <array/>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>additionalEngines</name>
+                <value>
+                    <array/>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>additionalUimafitEngines</name>
+                <value>
+                    <array/>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>additionalExtensions</name>
+                <value>
+                    <array>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
+                        <string>org.apache.uima.ruta.string.bool.BooleanOperationsExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
+                        <string>org.apache.uima.ruta.string.StringOperationsExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.OnlyOnceBlockExtension</string>
+                        <string>org.apache.uima.ruta.block.fst.FSTBlockExtension</string>
+                        <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
+                    </array>
+                </value>
+            </nameValuePair>
+            <nameValuePair>
+                <name>additionalEngineLoaders</name>
+                <value>
+                    <array/>
+                </value>
+            </nameValuePair>
+        </configurationParameterSettings>
+        <typeSystemDescription>
+            <imports>
+                <import location="BaseTypeSystem.xml"/>
+            </imports>
+        </typeSystemDescription>
+        <typePriorities>
+            <priorityList>
+                <type>org.apache.uima.ruta.type.RutaFrame</type>
+                <type>uima.tcas.Annotation</type>
+                <type>org.apache.uima.ruta.type.RutaBasic</type>
+            </priorityList>
+        </typePriorities>
+        <fsIndexCollection/>
+        <capabilities>
+            <capability>
+                <inputs/>
+                <outputs/>
+                <languagesSupported/>
+            </capability>
+        </capabilities>
+        <operationalProperties>
+            <modifiesCas>true</modifiesCas>
+            <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+            <outputsNewCASes>true</outputsNewCASes>
+        </operationalProperties>
+    </analysisEngineMetaData>
+    <resourceManagerConfiguration/>
+</analysisEngineDescription>

Added: uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseTypeSystem.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseTypeSystem.xml?rev=1676027&view=auto
==============================================================================
--- uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseTypeSystem.xml (added)
+++ uima/ruta/trunk/example-projects/TextRulerExample/descriptor/uima/ruta/example/BaseTypeSystem.xml Sat Apr 25 15:24:27 2015
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
+    <name>BaseTypeSystem</name>
+    <imports>
+        <import location="..\..\..\BasicTypeSystem.xml"/>
+        <import location="..\..\..\types\Bibtex.xml"/>
+    </imports>
+</typeSystemDescription>