[SCM] Spring Web Flow: Java MVC framework focused in View and Controller layers branch, master, updated. debian/2.0.9.RELEASE-3-1-gf88e799

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit f88e7993dd617769fc905ae5e7df7b2677f4a0e1
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Wed Mar 21 19:54:42 2012 -0430

    Fix #663569

diff --git a/debian/changelog b/debian/changelog
index e6709b8..84060a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libspring-webflow-2.0-java (2.0.9.RELEASE-4) UNRELEASED; urgency=low
+
+  * Fix FTBFS caused by new features in Spring Framework 3.0. (Closes: #663569).
+  * Bump Standards-Version to 3.9.3. No changes were required.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Wed, 21 Mar 2012 19:33:23 -0430
+
 libspring-webflow-2.0-java (2.0.9.RELEASE-3) unstable; urgency=low
 
   * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #638397). 
diff --git a/debian/control b/debian/control
index 5b806dd..51f7b9c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>> 7.0.50), ant, default-jdk, javahelper,
  libognl-java, libservlet2.5-java, libtiles-java, libportlet-api-2.0-spec-java,
  libspring-web-portlet-java, libspring-security-core-2.0-java,
  default-jdk-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.springsource.org/webflow
 Vcs-Git: git://git.debian.org/git/pkg-java/libspring-webflow-2.0-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libspring-webflow-2.0-java.git
diff --git a/debian/patches/spring_30.diff b/debian/patches/spring_30.diff
index 05a1565..c1bb56e 100644
--- a/debian/patches/spring_30.diff
+++ b/debian/patches/spring_30.diff
@@ -1,8 +1,8 @@
 Description: Dummy compatibility with Spring Framework 3.0
 Author: Miguel Landaeta <miguel at miguel.cc>
-Bug-Debian: http://bugs.debian.org/63839X
+Bug-Debian: http://bugs.debian.org/638397
 Forwarded: no
-Last-Update: 2011-08-18
+Last-Update: 2012-03-21
 
 --- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
 +++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/mvc/portlet/FlowHandlerAdapter.java
@@ -32,3 +32,55 @@ Last-Update: 2011-08-18
 +	}
 +
 +}
+--- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/ConversationScope.java
++++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/ConversationScope.java
+@@ -26,4 +26,7 @@ public class ConversationScope extends A
+ 	protected MutableAttributeMap getScope() {
+ 		return getRequiredRequestContext().getConversationScope();
+ 	}
++	public Object resolveContextualObject(String key) {
++		throw new UnsupportedOperationException("resolveContextualObject");
++	}
+ }
+--- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/RequestScope.java
++++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/RequestScope.java
+@@ -26,4 +26,7 @@ public class RequestScope extends Abstra
+ 	protected MutableAttributeMap getScope() {
+ 		return getRequiredRequestContext().getRequestScope();
+ 	}
+-}
+\ No newline at end of file
++	public Object resolveContextualObject(String key) {
++		throw new UnsupportedOperationException("resolveContextualObject");
++	}
++}
+--- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/FlashScope.java
++++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/FlashScope.java
+@@ -26,4 +26,7 @@ public class FlashScope extends Abstract
+ 	protected MutableAttributeMap getScope() {
+ 		return getRequiredRequestContext().getFlashScope();
+ 	}
++	public Object resolveContextualObject(String key) {
++		throw new UnsupportedOperationException("resolveContextualObject");
++	}
+ }
+--- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/ViewScope.java
++++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/ViewScope.java
+@@ -26,4 +26,7 @@ public class ViewScope extends AbstractW
+ 	protected MutableAttributeMap getScope() {
+ 		return getRequiredRequestContext().getViewScope();
+ 	}
++	public Object resolveContextualObject(String key) {
++		throw new UnsupportedOperationException("resolveContextualObject");
++	}
+ }
+--- libspring-webflow-2.0-java-2.0.9.RELEASE.orig/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/FlowScope.java
++++ libspring-webflow-2.0-java-2.0.9.RELEASE/projects/spring-webflow/src/main/java/org/springframework/webflow/scope/FlowScope.java
+@@ -26,4 +26,7 @@ public class FlowScope extends AbstractW
+ 	protected MutableAttributeMap getScope() {
+ 		return getRequiredRequestContext().getFlowScope();
+ 	}
++	public Object resolveContextualObject(String key) {
++		throw new UnsupportedOperationException("resolveContextualObject");
++	}
+ }

-- 
Spring Web Flow: Java MVC framework focused in View and Controller layers