Author: schor
Date: Thu Jan 19 16:38:10 2012
New Revision: 1233456
URL: http://svn.apache.org/viewvc?rev=1233456&view=rev
Log:
[UIMA-2349] DelegateAnalysisEngineType can only take a choice of some of the
elements in rs:resourceSpecifier; list just the ones it can take.
Same for FlowControllerDeclaration
Same for ExternalResourcesType
Add comment describing CollectionProcessingComponentType and its relationship
to AnalysisEngineDescriptionType
Modified:
uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
Modified:
uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd?rev=1233456&r1=1233455&r2=1233456&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
(original)
+++ uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
Thu Jan 19 16:38:10 2012
@@ -133,7 +133,11 @@
<complexType name="DelegateAnalysisEngineType">
<choice>
- <element ref="rs:resourceSpecifier" />
+ <element ref="rs:taeDescription"/>
+ <element ref="rs:analysisEngineDescription"/>
+ <element ref="rs:uriSpecifier"/>
+ <element ref="rs:customResourceSpecifier"/>
+ <element ref="rs:pearSpecifier"/>
<element name="import" type="rs:ImportType" />
</choice>
<attribute name="key" type="Name" />
@@ -141,7 +145,7 @@
<complexType name="FlowControllerDeclarationType">
<choice>
- <element ref="rs:resourceSpecifier" />
+ <element ref="rs:flowControllerDescription" />
<element name="import" type="rs:ImportType" />
</choice>
<attribute name="key" type="Name" />
@@ -449,7 +453,7 @@
</element>
</sequence>
</complexType>
-
+
<complexType name="TypeOrFeatureNameListType">
<sequence>
<group ref="rs:TypeOrFeature" minOccurs="0"
maxOccurs="unbounded" />
@@ -533,7 +537,13 @@
<sequence>
<element name="name"
type="string" />
<element name="description"
type="string" />
- <element
ref="rs:resourceSpecifier" />
+ <choice>
+ <element ref="rs:fileResourceSpecifier" />
+ <element ref="rs:fileLanguageResourceSpecifier" />
+ <element ref="rs:customResourceSpecifier" />
+ <element ref="rs:configurableDataResourceSpecifier" />
+ <element ref="rs:uriSpecifier" /> <!-- a test case tests this
-->
+ </choice>
<element
name="implementationName" type="string" minOccurs="0" />
</sequence>
</complexType>
@@ -575,6 +585,14 @@
<element name="casInitializerDescription"
type="rs:CollectionProcessingComponentDescriptionType"/>
<element name="casConsumerDescription"
type="rs:CollectionProcessingComponentDescriptionType"/>
+ <!-- similar to AnalysisEngineDescriptionType
+ drops some fields, and renames others
+ drops: primitive, flowController, sofaMappings (only appropriate with
aggregates)
+ renames: annotatorImplementationName -> implementationName
+ analysisEngineMetaData -> processingResourceMetaData
+ same: frameworkImplementation, externalResourceDependencies,
resourceManagerConfiguration
+ -->
+
<complexType name="CollectionProcessingComponentDescriptionType">
<sequence>
<element name="frameworkImplementation" type="string" />
