From f572f8b58203c3c8d52a1746c59f36d08763917b Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@vmware.com>
Date: Mon, 28 Jan 2013 12:01:12 -0500
Subject: [PATCH] Upgrade to Spring Framework 3.2.1 and fix warnings

---
 build.gradle                                           |  2 +-
 .../springframework/webflow/engine/package-info.java   |  4 ++--
 .../webflow/mvc/servlet/FlowHandlerAdapter.java        |  1 -
 .../webflow/upgrade/WebFlowUpgrader.java               | 10 +++++-----
 .../webflow/validation/BeanValidationHintResolver.java |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2c2176b5..af5d42f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ configure(subprojects.findAll {it.name != 'spring-js-resources'}) { subproject -
     }
 
     subproject.ext {
-      springVersion = '3.2.0.RELEASE'
+      springVersion = '3.2.1.RELEASE'
       springSecurityVersion = '3.1.3.RELEASE'
       slf4jVersion = '1.6.1'
       log4jVersion = '1.2.15'
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/package-info.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/package-info.java
index 7f71ffb4..1bb39fb2 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/package-info.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/package-info.java
@@ -17,9 +17,9 @@
 /**
  * The implementation of the web flow execution engine.
  *
- * <p>The engine implementation itself is located within the {@link org.springframework.webflow.engine.impl impl}
+ * <p>The engine implementation itself is located within the {@code org.springframework.webflow.engine.impl}
  * package. Builders for assembling flow definitions executable by this engine are located within the
- * {@link org.springframework.webflow.engine.builder builder} package.
+ * {@code org.springframework.webflow.engine.builder} package.
  */
 package org.springframework.webflow.engine;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
index fd3f6825..4ffa5cea 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
@@ -186,7 +186,6 @@ public class FlowHandlerAdapter extends WebContentGenerator implements HandlerAd
 	 * not mapped to flash scope.
 	 *
 	 * @param saveOutputToFlashScopeOnRedirect
-	 * @see #getFlashOutput(HttpServletRequest, HttpServletResponse, FlowExecutionResult)
 	 */
 	public void setSaveOutputToFlashScopeOnRedirect(boolean saveOutputToFlashScopeOnRedirect) {
 		this.saveOutputToFlashScopeOnRedirect = saveOutputToFlashScopeOnRedirect;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java
index 2b570dca..0da70b7b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java
@@ -31,16 +31,14 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
-import com.sun.org.apache.xml.internal.serializer.OutputPropertiesFactory;
-
 /**
  * Converts Web Flow 1 flow definitions to the version 2 syntax. To use, invoke as a Java application, passing the
  * file-system path to the flow definition you wish to convert as a program argument. The converted flow definition is
  * printed to standard out.
- * 
+ *
  * This class requires a XSLT transformer to run. Saxon is recommended to preserve flow definition formatting and line
  * breaks.
- * 
+ *
  * @author Scott Andrews
  */
 public class WebFlowUpgrader {
@@ -84,8 +82,10 @@ public class WebFlowUpgrader {
 			TransformerFactory factory = TransformerFactory.newInstance();
 			Source source = new StreamSource(xslResource.getInputStream());
 			transformer = factory.newTransformer(source);
-			transformer.setOutputProperty(OutputPropertiesFactory.S_KEY_INDENT_AMOUNT, "4");
+			// com.sun.org.apache.xml.internal.serializer.OutputPropertiesFactory.S_KEY_INDENT_AMOUNT
+			transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4");
 		}
 		return transformer;
 	}
+
 }
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/validation/BeanValidationHintResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/validation/BeanValidationHintResolver.java
index 716f9196..2a8c1f85 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/validation/BeanValidationHintResolver.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/validation/BeanValidationHintResolver.java
@@ -103,7 +103,7 @@ public class BeanValidationHintResolver implements ValidationHintResolver {
 	 * @param flowId the current flow id
 	 * @param stateId the current state id
 	 * @param hint the hint
-	 * @return
+	 * @return the resolved hint
 	 *
 	 * @throws FlowExecutionException
 	 */