You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/27 16:03:03 UTC

svn commit: r1075072 - in /lucene/dev/trunk/solr/contrib/uima/src: main/resources/org/apache/uima/desc/ test/java/org/apache/solr/uima/processor/ test/resources/ test/resources/solr-uima/conf/

Author: rmuir
Date: Sun Feb 27 15:03:03 2011
New Revision: 1075072

URL: http://svn.apache.org/viewvc?rev=1075072&view=rev
Log:
SOLR-2387: UIMA tests are unstable

Added:
    lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml   (with props)
    lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml   (with props)
    lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml   (with props)
    lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml   (with props)
Removed:
    lucene/dev/trunk/solr/contrib/uima/src/main/resources/org/apache/uima/desc/ExtServicesAE.xml
Modified:
    lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
    lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml

Modified: lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1075072&r1=1075071&r2=1075072&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Sun Feb 27 15:03:03 2011
@@ -36,7 +36,6 @@ import org.apache.solr.response.SolrQuer
 import org.apache.solr.update.processor.UpdateRequestProcessorChain;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -70,7 +69,6 @@ public class UIMAUpdateRequestProcessorT
   }
 
   @Test
-  @Ignore("unstable: see https://issues.apache.org/jira/browse/SOLR-2387")
   public void testProcessing() throws Exception {
     // this test requires an internet connection (e.g. opencalais api)
     checkInternetConnection();
@@ -85,31 +83,26 @@ public class UIMAUpdateRequestProcessorT
                     + " attached if you need it, but it is also committed to trunk and 3_x branch."
                     + " Last Lucene European Conference has been held in Prague."));
     assertU(commit());
-    assertQ(req("language:english"), "//*[@numFound='1']");
+    assertQ(req("suggested_category:*"), "//*[@numFound='1']");
   }
 
   @Test
-  public void testTwoUpdates() {
+  public void testTwoUpdates() throws Exception {
     // this test requires an internet connection (e.g. opencalais api)
     checkInternetConnection();
 
-    try {
-      addDoc(adoc("id", "1", "text", "The Apache Software Foundation is happy to announce "
-              + "BarCampApache Sydney, Australia, the first ASF-backed event in the Southern "
-              + "Hemisphere!"));
-      assertU(commit());
-      assertQ(req("language:english"), "//*[@numFound='1']");
-
-      addDoc(adoc("id", "2", "text", "Taking place 11th December 2010 at the University "
-              + "of Sydney's Darlington Centre, the BarCampApache \"unconference\" will be"
-              + " attendee-driven, facilitated by members of the Apache community and will "
-              + "focus on the Apache..."));
-      assertU(commit());
-      assertQ(req("language:english"), "//*[@numFound='2']");
+    addDoc(adoc("id", "1", "text", "The Apache Software Foundation is happy to announce "
+            + "BarCampApache Sydney, Australia, the first ASF-backed event in the Southern "
+            + "Hemisphere!"));
+    assertU(commit());
+    assertQ(req("suggested_category:*"), "//*[@numFound='1']");
 
-    } catch (Exception e) {
-      assumeNoException("Multiple updates on same instance didn't work", e);
-    }
+    addDoc(adoc("id", "2", "text", "Taking place 11th December 2010 at the University "
+            + "of Sydney's Darlington Centre, the BarCampApache \"unconference\" will be"
+            + " attendee-driven, facilitated by members of the Apache community and will "
+            + "focus on the Apache..."));
+    assertU(commit());
+    assertQ(req("suggested_category:*"), "//*[@numFound='2']");
   }
 
   private void addDoc(String doc) throws Exception {

Added: lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml?rev=1075072&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml (added)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml Sun Feb 27 15:03:03 2011
@@ -0,0 +1,58 @@
+<?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>false</primitive>
+  <delegateAnalysisEngineSpecifiers>
+    <delegateAnalysisEngine key="HmmTagger">
+      <import name="HmmTagger"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="WhitespaceTokenizer">
+      <import name="WhitespaceTokenizer"/>
+    </delegateAnalysisEngine>
+  </delegateAnalysisEngineSpecifiers>
+  <analysisEngineMetaData>
+    <name>AggregateSentenceAE</name>
+    <description/>
+    <version>1.0</version>
+    <vendor/>
+    <configurationParameters/>
+    <configurationParameterSettings/>
+    <flowConstraints>
+      <fixedFlow>
+        <node>WhitespaceTokenizer</node>
+        <node>HmmTagger</node>
+      </fixedFlow>
+    </flowConstraints>
+    <fsIndexCollection/>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs/>
+        <languagesSupported/>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+      <outputsNewCASes>false</outputsNewCASes>
+    </operationalProperties>
+  </analysisEngineMetaData>
+  <resourceManagerConfiguration/>
+</analysisEngineDescription>

Added: lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml?rev=1075072&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml (added)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml Sun Feb 27 15:03:03 2011
@@ -0,0 +1,194 @@
+<?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.annotator.calais.OpenCalaisAnnotator</annotatorImplementationName>
+  <analysisEngineMetaData>
+    <name>OpenCalaisAnnotator</name>
+    <description/>
+    <configurationParameters>
+      <configurationParameter>
+        <name>allowDistribution</name>
+        <description/>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>allowSearch</name>
+        <description/>
+        <type>Boolean</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>submitter</name>
+        <description/>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>licenseID</name>
+        <description/>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+    </configurationParameters>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>allowDistribution</name>
+        <value>
+          <boolean>false</boolean>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>allowSearch</name>
+        <value>
+          <boolean>false</boolean>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>submitter</name>
+        <value>
+          <string/>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>licenseID</name>
+        <value>
+          <string>OC_LICENSE_ID</string>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
+    <typeSystemDescription>
+      <types>
+        <typeDescription>
+          <name>org.apache.uima.calais.Person</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Anniversary</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.City</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Company</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Continent</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Country</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Currency</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.EmailAddress</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Facility</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.FaxNumber</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Holiday</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.IndustryTerm</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.NaturalDisaster</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.NaturalFeature</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Organization</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.PhoneNumber</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.ProviceOrState</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Region</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.Technology</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.URL</name>
+          <description/>
+          <supertypeName>org.apache.uima.calais.BaseType</supertypeName>
+        </typeDescription>
+        <typeDescription>
+          <name>org.apache.uima.calais.BaseType</name>
+          <description/>
+          <supertypeName>uima.tcas.Annotation</supertypeName>
+          <features>
+            <featureDescription>
+              <name>calaisType</name>
+              <description>OpenCalais type</description>
+              <rangeTypeName>uima.cas.String</rangeTypeName>
+            </featureDescription>
+          </features>
+        </typeDescription>
+      </types>
+    </typeSystemDescription>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs/>
+        <languagesSupported/>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+      <outputsNewCASes>false</outputsNewCASes>
+    </operationalProperties>
+  </analysisEngineMetaData>
+</analysisEngineDescription>

Added: lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml?rev=1075072&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml (added)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml Sun Feb 27 15:03:03 2011
@@ -0,0 +1,160 @@
+<?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>false</primitive>
+  <delegateAnalysisEngineSpecifiers>
+    <delegateAnalysisEngine key="TextKeywordExtractionAEDescriptor">
+      <import name="TextKeywordExtractionAEDescriptor"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="TextConceptTaggingAEDescriptor">
+      <import name="TextConceptTaggingAEDescriptor"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="OpenCalaisAnnotator">
+      <import name="OpenCalaisAnnotator"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="TextLanguageDetectionAEDescriptor">
+      <import name="TextLanguageDetectionAEDescriptor"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="TextCategorizationAEDescriptor">
+      <import name="TextCategorizationAEDescriptor"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="AggregateSentenceAE">
+      <import location="AggregateSentenceAE.xml"/>
+    </delegateAnalysisEngine>
+    <delegateAnalysisEngine key="TextRankedEntityExtractionAEDescriptor">
+      <import name="TextRankedEntityExtractionAEDescriptor"/>
+    </delegateAnalysisEngine>
+  </delegateAnalysisEngineSpecifiers>
+  <analysisEngineMetaData>
+    <name>ExtServicesAE</name>
+    <description/>
+    <version>1.0</version>
+    <vendor/>
+    <configurationParameters searchStrategy="language_fallback">
+      <configurationParameter>
+        <name>oc_licenseID</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>OpenCalaisAnnotator/licenseID</parameter>
+        </overrides>
+      </configurationParameter>
+      <configurationParameter>
+        <name>keyword_apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>TextKeywordExtractionAEDescriptor/apikey</parameter>
+        </overrides>
+      </configurationParameter>
+      <configurationParameter>
+        <name>concept_apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>TextConceptTaggingAEDescriptor/apikey</parameter>
+        </overrides>
+      </configurationParameter>
+      <configurationParameter>
+        <name>lang_apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>TextLanguageDetectionAEDescriptor/apikey</parameter>
+        </overrides>
+      </configurationParameter>
+      <configurationParameter>
+        <name>cat_apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>TextCategorizationAEDescriptor/apikey</parameter>
+        </overrides>
+      </configurationParameter>
+      <configurationParameter>
+        <name>entities_apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+        <overrides>
+          <parameter>TextRankedEntityExtractionAEDescriptor/apikey</parameter>
+        </overrides>
+      </configurationParameter>
+    </configurationParameters>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>oc_licenseID</name>
+        <value>
+          <string>licenseid</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>keyword_apikey</name>
+        <value>
+          <string>apikey</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>concept_apikey</name>
+        <value>
+          <string>apikey</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>lang_apikey</name>
+        <value>
+          <string>apikey</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>cat_apikey</name>
+        <value>
+          <string>apikey</string>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
+    <flowConstraints>
+      <fixedFlow>
+        <node>AggregateSentenceAE</node>
+        <node>OpenCalaisAnnotator</node>
+        <node>TextCategorizationAEDescriptor</node>
+      </fixedFlow>
+    </flowConstraints>
+    <fsIndexCollection/>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs/>
+        <languagesSupported/>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+      <outputsNewCASes>false</outputsNewCASes>
+    </operationalProperties>
+  </analysisEngineMetaData>
+  <resourceManagerConfiguration/>
+</analysisEngineDescription>
\ No newline at end of file

Added: lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml?rev=1075072&view=auto
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml (added)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml Sun Feb 27 15:03:03 2011
@@ -0,0 +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.alchemy.annotator.TextCategorizationAnnotator</annotatorImplementationName>
+  <analysisEngineMetaData>
+    <name>TextCategorizationAEDescriptor</name>
+    <description/>
+    <version>1.0</version>
+    <vendor/>
+    <configurationParameters>
+      <configurationParameter>
+        <name>apikey</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>outputMode</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>true</mandatory>
+      </configurationParameter>
+      <configurationParameter>
+        <name>baseUrl</name>
+        <type>String</type>
+        <multiValued>false</multiValued>
+        <mandatory>false</mandatory>
+      </configurationParameter>
+    </configurationParameters>
+    <configurationParameterSettings>
+      <nameValuePair>
+        <name>outputMode</name>
+        <value>
+          <string>xml</string>
+        </value>
+      </nameValuePair>
+      <nameValuePair>
+        <name>apikey</name>
+        <value>
+          <string>AA_API_KEY</string>
+        </value>
+      </nameValuePair>
+    </configurationParameterSettings>
+    <typeSystemDescription>
+      <types>
+        <typeDescription>
+          <name>org.apache.uima.alchemy.ts.categorization.Category</name>
+          <description/>
+          <supertypeName>uima.cas.TOP</supertypeName>
+          <features>
+            <featureDescription>
+              <name>score</name>
+              <description/>
+              <rangeTypeName>uima.cas.String</rangeTypeName>
+            </featureDescription>
+            <featureDescription>
+              <name>text</name>
+              <description/>
+              <rangeTypeName>uima.cas.String</rangeTypeName>
+            </featureDescription>
+          </features>
+        </typeDescription>
+      </types>
+    </typeSystemDescription>
+    <typePriorities/>
+    <fsIndexCollection/>
+    <capabilities>
+      <capability>
+        <inputs/>
+        <outputs/>
+        <languagesSupported/>
+      </capability>
+    </capabilities>
+    <operationalProperties>
+      <modifiesCas>true</modifiesCas>
+      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+      <outputsNewCASes>false</outputsNewCASes>
+    </operationalProperties>
+  </analysisEngineMetaData>
+  <resourceManagerConfiguration/>
+</analysisEngineDescription>

Modified: lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1075072&r1=1075071&r2=1075072&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml Sun Feb 27 15:03:03 2011
@@ -1071,7 +1071,7 @@
       <entities_apikey>04490000a72fe7ec5cb3497f14e77f338c86f2fe</entities_apikey>
       <oc_licenseID>g6h9zamsdtwhb93nc247ecrs</oc_licenseID>
   </runtimeParameters>
-  <analysisEngine>/org/apache/uima/desc/OverridingParamsExtServicesAE.xml</analysisEngine>
+  <analysisEngine>/TestAE.xml</analysisEngine>
   <analyzeFields merge="false">text</analyzeFields>
   <fieldMapping>
     <type name="org.apache.uima.alchemy.ts.categorization.Category">