svn commit: r516105 - in /incubator/uima/uimaj/trunk/uimaj-core/src: main/resources/resourceSpecifierSchema.xsd test/java/org/apache/uima/util/impl/XMLParser_implTest.java test/resources/XmlParserTest/TestUriSpecifier.xml

[al...@apache.org]

Author: alally
Date: Thu Mar  8 09:19:19 2007
New Revision: 516105

URL: http://svn.apache.org/viewvc?view=rev&rev=516105
Log:
Fix schema validation for uriSpecifier
UIMA-336: https://issues.apache.org/jira/browse/UIMA-336

Added:
    incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml
Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
    incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd?view=diff&rev=516105&r1=516104&r2=516105
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd Thu Mar  8 09:19:19 2007
@@ -613,6 +613,18 @@
           </simpleType>
         </element>
         <element name="timeout" type="integer" minOccurs="0"/>
+        <element name="parameters" minOccurs="0">
+          <complexType>
+            <sequence>
+              <element name="parameter" maxOccurs="unbounded">
+                <complexType>
+                  <attribute name="name" type="string"/>
+                  <attribute name="value" type="string"/>
+                </complexType>
+              </element>
+            </sequence>
+          </complexType>
+        </element>
       </sequence>
     </complexType>
   </element>

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java?view=diff&rev=516105&r1=516104&r2=516105
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java Thu Mar  8 09:19:19 2007
@@ -31,6 +31,8 @@
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
 import org.apache.uima.analysis_engine.TaeDescription;
 import org.apache.uima.flow.FlowControllerDescription;
+import org.apache.uima.resource.Parameter;
+import org.apache.uima.resource.URISpecifier;
 import org.apache.uima.test.junit_extension.JUnitExtension;
 import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLInputSource;
@@ -146,5 +148,20 @@
             JUnitExtension.getFile("TextAnalysisEngineImplTest/FlowControllerForErrorTest.xml"));
     FlowControllerDescription desc = mXmlParser.parseFlowControllerDescription(in);
     assertEquals("Flow Controller for Error Test", desc.getMetaData().getName());
+  }
+  
+  public void testParseURISpecifier() throws Exception {
+    XMLInputSource in = new XMLInputSource(
+            JUnitExtension.getFile("XmlParserTest/TestUriSpecifier.xml"));
+    URISpecifier uriSpec = mXmlParser.parseURISpecifier(in);
+    assertEquals("AnalysisEngine", uriSpec.getResourceType());
+    assertEquals("Vinci", uriSpec.getProtocol());
+    assertEquals(60000, uriSpec.getTimeout().intValue());
+    Parameter[] params = uriSpec.getParameters();
+    assertEquals(2, params.length);
+    assertEquals("VNS_HOST", params[0].getName());
+    assertEquals("some.internet.ip.name-or-address", params[0].getValue());
+    assertEquals("VNS_PORT", params[1].getName());
+    assertEquals("9000", params[1].getValue());    
   }
 }

Added: incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml?view=auto&rev=516105
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml (added)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/TestUriSpecifier.xml Thu Mar  8 09:19:19 2007
@@ -0,0 +1,10 @@
+<uriSpecifier xmlns="http://uima.apache.org/resourceSpecifier">
+   <resourceType>AnalysisEngine</resourceType>
+   <uri>uima.annot.PersonTitleAnnotator</uri>
+   <protocol>Vinci</protocol>
+   <timeout>60000</timeout> 
+   <parameters>
+     <parameter name="VNS_HOST" value="some.internet.ip.name-or-address"/>
+     <parameter name="VNS_PORT" value="9000"/>
+   </parameters>
+</uriSpecifier>
\ No newline at end of file