Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1181: Updated xsd to use "xsd:all" for elements within a <tasklet/>

Browse Source
This commit is contained in:
dhgarrette
2009-03-30 04:56:17 +00:00
parent 414bba967e
commit aac13324df
2 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java
View File

@@ -71,8 +71,8 @@ public abstract class AbstractStepParser {
* @param stepElement The &lt;step/&gt; element
* @param parserContext
* @param jobRepositoryRef The name of the bean defining the JobRepository.
* Use 'null' if the job-repository is specified on the
* &lt;tasklet/&gt; element; this method will look it up.
* Use 'null' if the job-repository is specified on the
* &lt;tasklet/&gt; element; this method will look it up.
*/
protected AbstractBeanDefinition parseStep(Element stepElement, ParserContext parserContext, String jobRepositoryRef) {
@@ -108,24 +108,18 @@ public abstract class AbstractStepParser {
String taskletRef = taskletElement.getAttribute(TASKLET_REF_ATTR);
@SuppressWarnings("unchecked")
List<Element> chunkTaskletElements = (List<Element>) DomUtils.getChildElementsByTagName(taskletElement,
CHUNK_ELE);
List<Element> chunkElements = (List<Element>) DomUtils.getChildElementsByTagName(taskletElement, CHUNK_ELE);
if (StringUtils.hasText(taskletRef)) {
if (chunkTaskletElements.size() > 0) {
if (chunkElements.size() > 0) {
parserContext.getReaderContext().error(
"The <" + CHUNK_ELE + "/> element can't be combined with the '" + TASKLET_REF_ATTR
+ "=\"" + taskletRef + "\"' attribute specification for <"
+ taskletElement.getNodeName() + "/>", taskletElement);
"The <" + CHUNK_ELE + "/> element can't be combined with the '" + TASKLET_REF_ATTR + "=\""
+ taskletRef + "\"' attribute specification for <" + taskletElement.getNodeName()
+ "/>", taskletElement);
}
parseTaskletRef(taskletRef, bd.getPropertyValues());
}
else if (chunkTaskletElements.size() == 1) {
chunkElementParser.parse(chunkTaskletElements.get(0), bd, parserContext, stepUnderspecified);
}
else if (chunkTaskletElements.size() > 1) {
parserContext.getReaderContext().error(
"The '<" + CHUNK_ELE + "/>' element may not appear more than once in a single <"
+ taskletElement.getNodeName() + "/>.", taskletElement);
else if (chunkElements.size() == 1) {
chunkElementParser.parse(chunkElements.get(0), bd, parserContext, stepUnderspecified);
}
else if (!stepUnderspecified) {
parserContext.getReaderContext().error(
@@ -204,11 +198,6 @@ public abstract class AbstractStepParser {
propertyValues.addPropertyValue("transactionTimeout", timeout);
}
}
else if (txAttrElements.size() > 1) {
parserContext.getReaderContext().error(
"The <" + TX_ATTRIBUTES_ELE + "/> element may not appear more than once in a single <"
+ stepElement.getNodeName() + "/>.", stepElement);
}
}
@SuppressWarnings("unchecked")
@@ -267,11 +256,6 @@ public abstract class AbstractStepParser {
propertyValues.addPropertyValue("listeners", listenerBeans);
parserContext.popAndRegisterContainingComponent();
}
else if (listenersElements.size() > 1) {
parserContext.getReaderContext().error(
"The <" + LISTENERS_ELE + "/> element may not appear more than once in a single <"
+ stepElement.getNodeName() + "/>.", stepElement);
}
}
}

12
spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
View File

@@ -264,10 +264,10 @@
</xsd:group>
<xsd:complexType name="taskletType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="chunk" type="chunkTaskletType" />
<xsd:element name="transaction-attributes" type="transaction-attributesType" />
<xsd:element name="no-rollback-exception-classes">
<xsd:all>
<xsd:element name="chunk" type="chunkTaskletType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="transaction-attributes" type="transaction-attributesType" minOccurs="0" maxOccurs="1"/>
<xsd:element name="no-rollback-exception-classes" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation><![CDATA[
List of exception classes that should not cause rollback if possible. This list
@@ -284,8 +284,8 @@
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="listeners" type="stepListenersType" />
</xsd:choice>
<xsd:element name="listeners" type="stepListenersType" minOccurs="0" maxOccurs="1"/>
</xsd:all>
<xsd:attribute name="ref" type="xsd:string" use="optional">
<xsd:annotation>
<xsd:documentation>