diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 9aed6d4c0..2be460f0f 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -215,7 +215,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-oxm</artifactId>
+			<artifactId>spring-oxm-tiger</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-batch-samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml b/spring-batch-samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml
deleted file mode 100644
index 4bc10a913..000000000
--- a/spring-batch-samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<records>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0001</isin>
-    <quantity>5</quantity>
-    <price>11.39</price>
-    <customer>Customer1</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0002</isin>
-    <quantity>2</quantity>
-    <price>72.99</price>
-    <customer>Customer2c</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0003</isin>
-    <quantity>9</quantity>
-    <price>99.99</price>
-    <customer>Customer3</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0001</isin>
-    <quantity>5</quantity>
-    <price>11.39</price>
-    <customer>Customer1</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0002</isin>
-    <quantity>2</quantity>
-    <price>72.99</price>
-    <customer>Customer2c</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0003</isin>
-    <quantity>9</quantity>
-    <price>99.99</price>
-    <customer>Customer3</customer>
-  </trade>
-    <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0001</isin>
-    <quantity>5</quantity>
-    <price>11.39</price>
-    <customer>Customer1</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0002</isin>
-    <quantity>2</quantity>
-    <price>72.99</price>
-    <customer>Customer2c</customer>
-  </trade>
-  <trade xmlns="http://springframework.org/batch/sample/io/oxm/domain">
-    <isin>XYZ0003</isin>
-    <quantity>9</quantity>
-    <price>99.99</price>
-    <customer>Customer3</customer>
-  </trade>  
-</records>
diff --git a/spring-batch-samples/src/main/resources/data/staxJob/input/trade.xsd b/spring-batch-samples/src/main/resources/data/staxJob/input/trade.xsd
deleted file mode 100644
index debcb1526..000000000
--- a/spring-batch-samples/src/main/resources/data/staxJob/input/trade.xsd
+++ /dev/null
@@ -1,17 +0,0 @@
-<xs:schema
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:bk="http://springframework.org/batch/sample/io/oxm/domain"
-    targetNamespace="http://springframework.org/batch/sample/io/oxm/domain"
-    elementFormDefault="qualified">
-    <xs:element name="trade">
-     <xs:complexType>
-        <xs:sequence>
-            <xs:element name="isin" type="xs:string"/>
-            <xs:element name="quantity" type="xs:long"/>
-            <xs:element name="price" type="xs:decimal"/>
-            <xs:element name="customer" type="xs:string"/>
-        </xs:sequence>
-     </xs:complexType>    
-    </xs:element>    
-</xs:schema>
-
diff --git a/spring-batch-samples/src/main/resources/data/staxJob/output/expected-output.xml b/spring-batch-samples/src/main/resources/data/staxJob/output/expected-output.xml
deleted file mode 100644
index e776a9ace..000000000
--- a/spring-batch-samples/src/main/resources/data/staxJob/output/expected-output.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<trades>
-	<trade>
-		<isin>XYZ0001</isin>
-		<quantity>5</quantity>
-		<price>11.39</price>
-		<customer>Customer1</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0002</isin>
-		<quantity>2</quantity>
-		<price>72.99</price>
-		<customer>Customer2c</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0003</isin>
-		<quantity>9</quantity>
-		<price>99.99</price>
-		<customer>Customer3</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0001</isin>
-		<quantity>5</quantity>
-		<price>11.39</price>
-		<customer>Customer1</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0002</isin>
-		<quantity>2</quantity>
-		<price>72.99</price>
-		<customer>Customer2c</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0003</isin>
-		<quantity>9</quantity>
-		<price>99.99</price>
-		<customer>Customer3</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0001</isin>
-		<quantity>5</quantity>
-		<price>11.39</price>
-		<customer>Customer1</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0002</isin>
-		<quantity>2</quantity>
-		<price>72.99</price>
-		<customer>Customer2c</customer>
-	</trade>
-	<trade>
-		<isin>XYZ0003</isin>
-		<quantity>9</quantity>
-		<price>99.99</price>
-		<customer>Customer3</customer>
-	</trade>
-</trades>
\ No newline at end of file
diff --git a/spring-batch-test/.settings/org.eclipse.jdt.core.prefs b/spring-batch-test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..1e0c121f9
--- /dev/null
+++ b/spring-batch-test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Fri Jan 07 07:31:09 GMT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/spring-batch-test/.settings/org.maven.ide.eclipse.prefs b/spring-batch-test/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..ecbeaef06
--- /dev/null
+++ b/spring-batch-test/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Fri Jan 07 07:30:59 GMT 2011
+activeProfiles=spring3
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1