From b65a634d591cbf15d64efb8af918eb1828dae58a Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 21 Nov 2009 21:23:26 +0000
Subject: [PATCH] RESOLVED - BATCH-981: Use Woodstox instead of ref impl of
 StaX

switched to woodstox-core-asl 4.0.6
---
 spring-batch-infrastructure-tests/pom.xml      | 17 +++++------------
 spring-batch-infrastructure/pom.xml            | 18 ++++--------------
 .../file/MultiResourceItemWriterXmlTests.java  |  8 ++++----
 .../item/xml/StaxEventItemWriterTests.java     |  6 +++---
 .../TransactionalStaxEventItemWriterTests.java |  4 ++--
 spring-batch-parent/pom.xml                    |  6 +++---
 spring-batch-samples/pom.xml                   | 18 ++++--------------
 7 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml
index b94e41e1d..013d0c05a 100644
--- a/spring-batch-infrastructure-tests/pom.xml
+++ b/spring-batch-infrastructure-tests/pom.xml
@@ -13,18 +13,6 @@
     <relativePath>../spring-batch-parent</relativePath>
   </parent>
   <profiles>
-    <profile>
-      <id>tiger</id>
-      <activation>
-        <jdk>1.5</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>stax</groupId>
-          <artifactId>stax</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>default</id>
       <activation>
@@ -133,6 +121,11 @@
       <artifactId>xstream</artifactId>
       <scope>test</scope>
     </dependency>
+	<dependency>
+		<groupId>org.codehaus.woodstox</groupId>
+		<artifactId>woodstox-core-asl</artifactId>	
+		<scope>test</scope>
+	</dependency>
     <dependency>
       <groupId>org.springframework.ws</groupId>
       <artifactId>spring-oxm</artifactId>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 8b3567eef..90f49466b 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -16,20 +16,6 @@
 		<version>2.1.0.CI-SNAPSHOT</version>
 		<relativePath>../spring-batch-parent</relativePath>
 	</parent>
-	<profiles>
-		<profile>
-			<id>tiger</id>
-			<activation>
-				<jdk>1.5</jdk>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>stax</groupId>
-					<artifactId>stax</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
 	<build>
 		<plugins>
 			<plugin>
@@ -180,6 +166,10 @@
 			<artifactId>spring-tx</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.woodstox</groupId>
+			<artifactId>woodstox-core-asl</artifactId>	
+		</dependency>
 	</dependencies>
 	<reporting>
 		<plugins>
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java
index 9dedbb628..28abbd674 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java
@@ -88,8 +88,8 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr
 		tested.update(executionContext);
 		tested.close();
 
-		assertEquals(xmlDocStart + "<prefix:4></prefix:4>" + xmlDocEnd, readFile(part2));
-		assertEquals(xmlDocStart + "<prefix:1></prefix:1><prefix:2></prefix:2><prefix:3></prefix:3>" + xmlDocEnd,
+		assertEquals(xmlDocStart + "<prefix:4/>" + xmlDocEnd, readFile(part2));
+		assertEquals(xmlDocStart + "<prefix:1/><prefix:2/><prefix:3/>" + xmlDocEnd,
 				readFile(part1));
 
 		tested.open(executionContext);
@@ -102,9 +102,9 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr
 
 		tested.close();
 
-		assertEquals(xmlDocStart + "<prefix:4></prefix:4><prefix:5></prefix:5>" + xmlDocEnd, readFile(part2));
+		assertEquals(xmlDocStart + "<prefix:4/><prefix:5/>" + xmlDocEnd, readFile(part2));
 		assertEquals(xmlDocStart
-				+ "<prefix:6></prefix:6><prefix:7></prefix:7><prefix:8></prefix:8><prefix:9></prefix:9>" + xmlDocEnd,
+				+ "<prefix:6/><prefix:7/><prefix:8/><prefix:9/>" + xmlDocEnd,
 				readFile(part3));
 	}
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java
index 549412eb7..5029c0879 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java
@@ -176,7 +176,7 @@ public class StaxEventItemWriterTests {
 		writer.open(executionContext);
 		writer.write(items);
 		String content = outputFileContent();
-		assertTrue("Wrong content: " + content, content.contains(("<header></header>")));
+		assertTrue("Wrong content: " + content, content.contains(("<header/>")));
 		assertTrue("Wrong content: " + content, content.contains(TEST_STRING));
 	}
 
@@ -240,8 +240,8 @@ public class StaxEventItemWriterTests {
 		String content = outputFileContent();
 
 		assertTrue(content.contains("<testroot attribute=\"value\">"));
-		assertTrue(content.contains("<header></header>"));
-		assertTrue(content.contains("<footer></footer>"));
+		assertTrue(content.contains("<header/>"));
+		assertTrue(content.contains("<footer/>"));
 		assertTrue(content.endsWith("</testroot>"));
 	}
 
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java
index c051b4214..2411c365e 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java
@@ -141,7 +141,7 @@ public class TransactionalStaxEventItemWriterTests {
 		});
 		writer.close();
 		String content = outputFileContent();
-		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("<header></header>")));
+		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("<header/>")));
 		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, TEST_STRING));
 	}
 
@@ -199,7 +199,7 @@ public class TransactionalStaxEventItemWriterTests {
 		}
 		writer.close();
 		String content = outputFileContent();
-		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("<header></header>")));
+		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("<header/>")));
 		assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, TEST_STRING));
 	}
 
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 1d7bda5fb..88daeee09 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -288,9 +288,9 @@
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>stax</groupId>
-				<artifactId>stax</artifactId>
-				<version>1.2.0</version>
+				<groupId>org.codehaus.woodstox</groupId>
+				<artifactId>woodstox-core-asl</artifactId>
+				<version>4.0.6</version>
 				<optional>true</optional>
 			</dependency>
 			<dependency>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 06e20952a..b95ec135b 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -16,20 +16,6 @@
 		<!-- Override this with -Denvironment=XXXX to change database type -->
 		<environment>hsql</environment>
 	</properties>
-	<profiles>
-		<profile>
-			<id>tiger</id>
-			<activation>
-				<jdk>1.5</jdk>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>stax</groupId>
-					<artifactId>stax</artifactId>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
@@ -128,6 +114,10 @@
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.woodstox</groupId>
+			<artifactId>woodstox-core-asl</artifactId>	
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>