From 33bd09801b1891b665f97ab24c1856e412151458 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Mon, 31 Mar 2014 15:57:30 -0400
Subject: [PATCH] Deprecate Spring.js

Issue: SWF-1628
---
 .../js/ajax/SpringJavascriptAjaxHandler.java             | 6 ++++--
 src/reference/whatsnew.xml                               | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java b/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java
index 48a6268d..2ddb7f06 100644
--- a/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java
+++ b/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java
@@ -24,11 +24,13 @@ import org.springframework.util.StringUtils;
 
 /**
  * Ajax handler for Spring Javascript (Spring.js).
- * 
+ *
  * @see AbstractAjaxHandler
- * 
+ *
  * @author Jeremy Grelle
  * @author Keith Donald
+ *
+ * @deprecated as of version 2.4 Spring.js is deprecated
  */
 public class SpringJavascriptAjaxHandler extends AbstractAjaxHandler {
 
diff --git a/src/reference/whatsnew.xml b/src/reference/whatsnew.xml
index 53658da3..703848b4 100644
--- a/src/reference/whatsnew.xml
+++ b/src/reference/whatsnew.xml
@@ -80,6 +80,15 @@
 		</sect2>
 		<sect2 xml:id="whatsnew-deprecation">
 			<title>Deprecations</title>
+			<para>
+				This release deprecates <emphasis>Spring.js</emphasis>. The deprecation includes the entire
+				<emphasis>spring-js-resources</emphasis> module including <emphasis>Spring.js</emphasis> and
+				<emphasis>Spring-Dojo.js</emphasis> and the bundled Dojo and CSS Framework.
+				Also deprecated is the <classname>SpringJavascriptAjaxHandler</classname>
+				from the <emphasis>spring-js</emphasis> module. The rest of <emphasis>spring-js</emphasis>,
+				e.g. <classname>AjaxHandler</classname>, <classname>AjaxTilesView</classname>, will be
+				folded into <emphasis>spring-webflow</emphasis> in a future release.
+			</para>
 			<para>
 				OGNL support is now deprecated.
 			</para>