uima-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Adam Lally <ala...@alum.rpi.edu>
Subject Another try at sending a plain-text patch
Date Tue, 07 Nov 2006 19:02:01 GMT
I think the GMail web client may have inserted newlines.  Here's a try 
via SMTP instead. 
  -Adam


Index: uimaj-core/pom.xml
===================================================================
--- uimaj-core/pom.xml    (revision 470933)
+++ uimaj-core/pom.xml    (working copy)
@@ -41,5 +41,14 @@
     </dependencies>
     <build>
         <finalName>uima-core</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Xmx384M</argLine>
+                </configuration>
+            </plugin>        
+        </plugins>
     </build>
 </project>
\ No newline at end of file
Index: 
uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
===================================================================
--- 
uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java   
 (revision 470933)
+++ 
uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java   
 (working copy)
@@ -25,6 +25,7 @@
 import junit.framework.TestCase;
 
 import org.apache.uima.UIMAFramework;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
 import org.apache.uima.analysis_engine.TaeDescription;
 import org.apache.uima.test.junit_extension.JUnitExtension;
 import org.apache.uima.util.XMLInputSource;
@@ -68,31 +69,20 @@
   {
     try
     {
-      //JTalentAndStringMatch.xml contains xincludes,
+      //JTalentAndStringMatch.xml contains imports,
       //JTalentAndStringMatch_Expanded.xml has had them manually expanded
-      File withXIncludes = 
JUnitExtension.getFile("XmlParserTest/JTalentAndStringMatch.xml");
+      File withImports = 
JUnitExtension.getFile("XmlParserTest/JTalentAndStringMatch.xml");
       File manuallyExpanded = 
JUnitExtension.getFile("XmlParserTest/JTalentAndStringMatch_Expanded.xml");
       
-      //After passing JTalentAndStringMatch.xml through processXIncludes,
+      //After parsing both files and calling resolveImports,
       //we should then be able to parse both files and get identical 
results.
-      XMLizable obj1 = mXmlParser.parse(new XMLInputSource(withXIncludes));
-      XMLizable obj2 = mXmlParser.parse(new 
XMLInputSource(manuallyExpanded));
-      Assert.assertNotNull(obj1);    
-      Assert.assertNotNull(obj2);    
-      Assert.assertEquals(obj1,obj2);
-      
-      //try similar test for XInclude containing xpointer
-      withXIncludes = 
JUnitExtension.getFile("XmlParserTest/XIncludeXPointerTest.xml");
-      manuallyExpanded = 
JUnitExtension.getFile("XmlParserTest/XIncludeXPointerTest_Expanded.xml");
-      
-      //After passing JTalentAndStringMatch.xml through processXIncludes,
-      //we should then be able to parse both files and get identical 
results.
-      obj1 = mXmlParser.parse(new XMLInputSource(withXIncludes));
-      obj2 = mXmlParser.parse(new XMLInputSource(manuallyExpanded));
-      Assert.assertNotNull(obj1);
-      //obj1.toXML(System.out);
-      Assert.assertNotNull(obj2);    
-      Assert.assertEquals(obj1,obj2);
+      AnalysisEngineDescription desc1 = (AnalysisEngineDescription)
+        mXmlParser.parse(new XMLInputSource(withImports));
+      AnalysisEngineDescription desc2 = (AnalysisEngineDescription)
+        mXmlParser.parse(new XMLInputSource(manuallyExpanded));
+      Assert.assertNotNull(desc1);    
+      Assert.assertNotNull(desc2);
+      
Assert.assertEquals(desc1.getDelegateAnalysisEngineSpecifiers(),desc2.getDelegateAnalysisEngineSpecifiers());


     }
     catch (Exception e)
     {
Index: uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml
===================================================================
--- 
uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml   
 (revision 470933)
+++ 
uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml   
 (working copy)
@@ -25,11 +25,11 @@
 
 <delegateAnalysisEngineSpecifiers>
 <delegateAnalysisEngine key="JTalent">
-<xi:include href="JTalentAnnotator_Enhanced.xml"/>
+<import location="JTalentAnnotator_Enhanced.xml"/>
 </delegateAnalysisEngine>
 
 <delegateAnalysisEngine key="StringMatch">
-<xi:include href="StringMatchAnnotator2.xml"/>
+<import location="StringMatchAnnotator2.xml"/>
 </delegateAnalysisEngine>
 </delegateAnalysisEngineSpecifiers>
 
Index: 
uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml
===================================================================
--- 
uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml   
 (revision 470933)
+++ 
uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml   
 (working copy)
@@ -19,8 +19,8 @@
  -->
 
 <taeDescription xmlns="http://uima.watson.ibm.com/resourceSpecifier">
+<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
 <primitive>true</primitive>
-<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
 <annotatorImplementationName>org.apache.research.talentuima.annotations.JTalentAnnotator_Enhanced</annotatorImplementationName>
 
 <analysisEngineMetaData>


Mime
View raw message