From bb60cb43ed06ab6f5de82acf751a6d70f6cf26d0 Mon Sep 17 00:00:00 2001
From: lucasward <lucasward@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 26 Sep 2007 15:32:27 +0000
Subject: [PATCH] OPEN - issue BATCH-113: Mouldy xml class names still in
 infrastructure
 http://opensource.atlassian.com/projects/spring/browse/BATCH-113

io.xml files removed from src/test/resources as well.
---
 .../xml/20070125.testStream.xmlFileStep.xml   |  88 ------------
 .../batch/io/xml/purchaseorders.xsd           |  50 -------
 .../springframework/batch/io/xml/test1.xml    |  10 --
 .../springframework/batch/io/xml/test2.xml    |  12 --
 .../io/xml/xstream/xstream-config-test.xml    | 130 ------------------
 5 files changed, 290 deletions(-)
 delete mode 100644 infrastructure/src/test/resources/org/springframework/batch/io/xml/20070125.testStream.xmlFileStep.xml
 delete mode 100644 infrastructure/src/test/resources/org/springframework/batch/io/xml/purchaseorders.xsd
 delete mode 100644 infrastructure/src/test/resources/org/springframework/batch/io/xml/test1.xml
 delete mode 100644 infrastructure/src/test/resources/org/springframework/batch/io/xml/test2.xml
 delete mode 100644 infrastructure/src/test/resources/org/springframework/batch/io/xml/xstream/xstream-config-test.xml

diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/xml/20070125.testStream.xmlFileStep.xml b/infrastructure/src/test/resources/org/springframework/batch/io/xml/20070125.testStream.xmlFileStep.xml
deleted file mode 100644
index 73ec2ad43..000000000
--- a/infrastructure/src/test/resources/org/springframework/batch/io/xml/20070125.testStream.xmlFileStep.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<purchase-orders xmlns="http://adsj.accenture.com/purchaseorders"
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://adsj.accenture.com/purchaseorders purchaseorders.xsd">
-    <order>
-        <customer>
-            <name>Gladys Kravitz</name>
-            <address>Anytown, PA</address>
-            <age>34</age>
-            <moo>0</moo>
-            <poo>0</poo>
-        </customer>
-        <date>2003-01-07 14:16:00 GMT</date>
-        <lineItems>
-	        <lineItem>
-	            <description>Burnham's Celestial Handbook, Vol 1</description>
-	            <perUnitOunces>5</perUnitOunces>
-	            <price>21.79</price>
-	            <quantity>2</quantity>
-	        </lineItem>
-	        <lineItem>
-	            <description>Burnham's Celestial Handbook, Vol 2</description>
-	            <perUnitOunces>5</perUnitOunces>
-	            <price>19.89</price>
-	            <quantity>2</quantity>
-	        </lineItem>
-	    </lineItems>    
-        <shipper>
-            <name>ZipShip</name>
-            <perOunceRate>0.74</perOunceRate>
-        </shipper>
-    </order>
-    <order>
-        <customer>
-            <name>John Smith</name>
-            <address>Chicago, IL</address>
-            <age>46</age>
-            <moo>0</moo>
-            <poo>0</poo>
-        </customer>
-        <date>2003-01-07 14:16:02 GMT</date>
-        <lineItems>        
-	        <lineItem>
-	            <description>XmlBeans in Action</description>
-	            <perUnitOunces>3</perUnitOunces>
-	            <price>41.29</price>
-	            <quantity>1</quantity>
-	        </lineItem>
-	        <lineItem>
-	            <description>JSR-173</description>
-	            <perUnitOunces>1</perUnitOunces>
-	            <price>11.99</price>
-	            <quantity>5</quantity>
-	        </lineItem>
-	        <lineItem>
-	            <description>Teach Yourself XML in 21 days</description>
-	            <perUnitOunces>1</perUnitOunces>
-	            <price>35.49</price>
-	            <quantity>1</quantity>
-	        </lineItem>        
-        </lineItems>	        
-        <shipper>
-            <name>ZipShip</name>
-            <perOunceRate>0.74</perOunceRate>
-        </shipper>
-    </order>            
-    <order>
-        <customer>
-            <name>Peter Newman</name>
-            <address>Cleveland, OH</address>
-            <age>23</age>
-            <moo>0</moo>
-            <poo>0</poo>
-        </customer>
-        <date>2003-01-07 14:16:35 GMT</date>
-        <lineItems>
-	        <lineItem>
-	            <description>Java 6</description>
-	            <perUnitOunces>2</perUnitOunces>
-	            <price>12.79</price>
-	            <quantity>3</quantity>
-	        </lineItem>
-        </lineItems>    
-        <shipper>
-            <name>UPS</name>
-            <perOunceRate>0.69</perOunceRate>
-        </shipper>
-    </order>                
-</purchase-orders>
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/xml/purchaseorders.xsd b/infrastructure/src/test/resources/org/springframework/batch/io/xml/purchaseorders.xsd
deleted file mode 100644
index 1536a9859..000000000
--- a/infrastructure/src/test/resources/org/springframework/batch/io/xml/purchaseorders.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xs:schema
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:po="http://adsj.accenture.com/purchaseorders"
-    targetNamespace="http://adsj.accenture.com/purchaseorders"
-    elementFormDefault="qualified">
-    <xs:element name="purchase-orders">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="order" type="po:order" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>            
-    </xs:element>
-    <xs:complexType name="order">
-        <xs:sequence>
-            <xs:element name="customer" type="po:customer"/>
-            <xs:element name="date" type="xs:string"/>
-            <xs:element name="lineItems" type="po:lineItems"/>
-            <xs:element name="shipper" type="po:shipper" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="customer">
-        <xs:sequence>
-            <xs:element name="name" type="xs:string"/>
-            <xs:element name="address" type="xs:string"/>
-            <xs:element name="age" type="xs:int"/>
-            <xs:element name="moo" type="xs:int" default="100"/>
-            <xs:element name="poo" type="xs:int" default="200"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="lineItems">
-    	<xs:sequence>
-    		<xs:element name="lineItem" type="po:lineItem" minOccurs="0" maxOccurs="unbounded"/>
-    	</xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="lineItem">
-        <xs:sequence>
-            <xs:element name="description" type="xs:string"/>
-            <xs:element name="perUnitOunces" type="xs:decimal"/>
-            <xs:element name="price" type="xs:decimal"/>
-            <xs:element name="quantity" type="xs:integer"/>
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="shipper">
-        <xs:sequence>
-            <xs:element name="name" type="xs:string"/>
-            <xs:element name="perOunceRate" type="xs:decimal"/>
-        </xs:sequence>
-    </xs:complexType>
-</xs:schema>
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/xml/test1.xml b/infrastructure/src/test/resources/org/springframework/batch/io/xml/test1.xml
deleted file mode 100644
index 744ef658a..000000000
--- a/infrastructure/src/test/resources/org/springframework/batch/io/xml/test1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<book>
-	<title>Programming Java</title>
-	<author>John Smith</author>
-	<pages>480</pages>
-</book>
-<book>
-	<title>Programming C#</title>
-	<author>Kate Newman</author>
-	<pages>579</pages>
-</book>
\ No newline at end of file
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/xml/test2.xml b/infrastructure/src/test/resources/org/springframework/batch/io/xml/test2.xml
deleted file mode 100644
index 5ff36d92a..000000000
--- a/infrastructure/src/test/resources/org/springframework/batch/io/xml/test2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<library>
-	<book>
-		<title>Programming Java</title>
-		<author>John Smith</author>
-		<pages>480</pages>
-	</book>
-	<book>
-		<title>Programming C#</title>
-		<author>Kate Newman</author>
-		<pages>579</pages>
-	</book>
-</library>	
\ No newline at end of file
diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/xml/xstream/xstream-config-test.xml b/infrastructure/src/test/resources/org/springframework/batch/io/xml/xstream/xstream-config-test.xml
deleted file mode 100644
index 5d7e97925..000000000
--- a/infrastructure/src/test/resources/org/springframework/batch/io/xml/xstream/xstream-config-test.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <mode>1003</mode>
-  <root-element-name>root_test</root-element-name>
-  <root-element-attributes>
-    <attribute>
-      <key>root-elementAttr_key1</key>
-      <value>root-elementAttr_value1</value>
-    </attribute>  
-    <attribute>
-      <key>root-elementAttr_key2</key>
-      <value>root-elementAttr_value2</value>
-    </attribute>  
-  </root-element-attributes>
-  <class-aliases>
-    <class-alias>
-        <name>class-alias_name1</name>
-        <type>class-alias_type1</type>
-        <default-implementation>class-alias_di1</default-implementation>
-    </class-alias>
-    <class-alias>
-        <name>class-alias_name2</name>
-        <type>class-alias_type2</type>
-        <default-implementation>class-alias_di2</default-implementation>
-    </class-alias>
-  </class-aliases>
-  <type-aliases>
-    <type-alias>
-        <name>type-alias_name1</name>
-        <type>type-alias_type1</type>
-    </type-alias>
-    <type-alias>
-        <name>type-alias_name2</name>
-        <type>type-alias_type2</type>
-    </type-alias>
-  </type-aliases>
-  <field-aliases>
-    <field-alias>
-      <alias-name>field-alias_name1</alias-name>
-      <type>field-alias_type1</type>
-      <field-name>field1</field-name>
-    </field-alias>
-    <field-alias>
-      <alias-name>field-alias_name2</alias-name>
-      <type>field-alias_type2</type>
-      <field-name>field2</field-name>
-    </field-alias>
-  </field-aliases>
-  <attribute-aliases>
-    <attribute-alias>
-        <attribute-name>attribute-alias_name1</attribute-name>
-        <alias>attribute-alias_alias1</alias>
-    </attribute-alias>
-    <attribute-alias>
-        <attribute-name>attribute-alias_name2</attribute-name>
-        <alias>attribute-alias_alias2</alias>
-    </attribute-alias>
-  </attribute-aliases>
-  <attributes>
-    <attribute-properties>
-      <type>attribute-properties_type1</type>
-      <field-name>attribute-properties_field1</field-name>
-    </attribute-properties>
-    <attribute-properties>
-      <type>attribute-properties_type2</type>
-      <field-name>attribute-properties_field2</field-name>
-    </attribute-properties>
-  </attributes>
-  <converters>
-    <converter-properties>
-      <class-name>converter.class-name1</class-name>
-      <priority>-50</priority>
-    </converter-properties>
-    <converter-properties>
-      <class-name>converter.class-name2</class-name>
-      <priority>750</priority>
-    </converter-properties>
-  </converters>
-  <implicit-collections>
-    <implicit-collection>
-      <owner-type>ic_owner-type1</owner-type>
-      <field-name>ic_field-name1</field-name>
-      <item-field-name>ic_itemField-name1</item-field-name>
-      <item-type>ic_item-type1</item-type>
-    </implicit-collection>
-    <implicit-collection>
-      <owner-type>ic_owner-type2</owner-type>
-      <field-name>ic_field-name2</field-name>
-      <item-type>ic_item-type2</item-type>
-    </implicit-collection>
-  </implicit-collections>
-  <ommited-fields>
-    <ommited-field>
-      <type>ommited-field_type1</type>
-      <field-name>ommited-field_field1</field-name>
-    </ommited-field>
-    <ommited-field>
-      <field-name>ommited-field_field2</field-name>
-      <type>ommited-field_type2</type>
-    </ommited-field>
-  </ommited-fields>
-  <immutable-types>
-    <type>immutable-type1</type>
-    <type>immutable-type2</type>
-  </immutable-types>
-  <default-implementations>
-    <default-implementation>
-      <default-impl>default-implementation1</default-impl>
-      <type>type1</type>
-    </default-implementation>
-    <default-implementation>
-      <default-impl>default-implementation2</default-impl>
-      <type>type2</type>
-    </default-implementation>
-  </default-implementations>
-  <mappings>
-    <mapping>
-      <namespaceURI>uri1</namespaceURI>
-      <localPart>localpart1</localPart>
-      <prefix>prefix1</prefix>
-      <class-name>classname1</class-name>
-    </mapping>
-    <mapping>
-      <namespaceURI>uri2</namespaceURI>
-      <localPart>localpart2</localPart>
-      <prefix>prefix2</prefix>
-      <class-name>classname2</class-name>
-    </mapping>
-  </mappings>
-</configuration>