You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/09 15:25:35 UTC
svn commit: r472910 - in /incubator/uima/uimaj/trunk/uimaj-core: pom.xml
src/main/resources/TaeSpecifierSchema.xsd
src/test/resources/XmlParserTest/JTalentAndStringMatch.xml
src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml
Author: alally
Date: Thu Nov 9 06:25:34 2006
New Revision: 472910
URL: http://svn.apache.org/viewvc?view=rev&rev=472910
Log:
Fix unit tests so they run on Sun Java 1.5
Modified:
incubator/uima/uimaj/trunk/uimaj-core/pom.xml
incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/TaeSpecifierSchema.xsd
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml
Modified: incubator/uima/uimaj/trunk/uimaj-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/pom.xml?view=diff&rev=472910&r1=472909&r2=472910
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/pom.xml Thu Nov 9 06:25:34 2006
@@ -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>
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/TaeSpecifierSchema.xsd
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/TaeSpecifierSchema.xsd?view=diff&rev=472910&r1=472909&r2=472910
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/TaeSpecifierSchema.xsd (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/resources/TaeSpecifierSchema.xsd Thu Nov 9 06:25:34 2006
@@ -314,7 +314,7 @@
<complexType name="TypeDescriptionType">
<sequence>
<element name="name" type="Name" />
- <element name="description" type="string" />
+ <element name="description" type="string" minOccurs="0"/>
<element name="supertypeName" type="Name" />
<choice>
<element name="allowedValues" minOccurs="0">
@@ -324,7 +324,7 @@
<complexType>
<sequence>
<element name="string" type="string" />
- <element name="description" type="string" />
+ <element name="description" type="string" minOccurs="0"/>
</sequence>
</complexType>
</element>
@@ -338,7 +338,7 @@
<complexType>
<sequence>
<element name="name" type="Name" />
- <element name="description" type="string" />
+ <element name="description" type="string" minOccurs="0"/>
<element name="rangeTypeName" type="Name" />
<element name="elementType" type="string" minOccurs="0" />
<element name="multipleReferencesAllowed" type="boolean" minOccurs="0" />
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml?view=diff&rev=472910&r1=472909&r2=472910
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAndStringMatch.xml Thu Nov 9 06:25:34 2006
@@ -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>
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml?view=diff&rev=472910&r1=472909&r2=472910
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/XmlParserTest/JTalentAnnotator_Enhanced.xml Thu Nov 9 06:25:34 2006
@@ -19,8 +19,8 @@
-->
<taeDescription xmlns="http://uima.watson.ibm.com/resourceSpecifier">
-<primitive>true</primitive>
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+<primitive>true</primitive>
<annotatorImplementationName>org.apache.research.talentuima.annotations.JTalentAnnotator_Enhanced</annotatorImplementationName>
<analysisEngineMetaData>