From a54312dc6fa1f751c05fdfc76b4f5c117dfbc171 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Fri, 30 Nov 2012 11:43:48 -0500
Subject: [PATCH] INT-2841 - Fix broken links

---
 src/reference/docbook/amqp.xml            |  2 +-
 src/reference/docbook/changes-2.0-2.1.xml |  2 +-
 src/reference/docbook/jdbc.xml            |  4 ++--
 src/reference/docbook/router.xml          | 17 +++++++++--------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/reference/docbook/amqp.xml b/src/reference/docbook/amqp.xml
index a473a61228..d0339b2426 100644
--- a/src/reference/docbook/amqp.xml
+++ b/src/reference/docbook/amqp.xml
@@ -548,7 +548,7 @@ this list can also be simple patterns to be matched against the header names (e.
 		</para>
 		<para>
 			Any user-defined headers within the AMQP
-			<classname><ulink url="http://static.springsource.org/spring-amqp/docs/latest-ga/apidocs/org/springframework/amqp/core/MessageProperties.html">MessageProperties</ulink></classname>
+			<classname><ulink url="http://static.springsource.org/spring-amqp/api/org/springframework/amqp/core/MessageProperties.html">MessageProperties</ulink></classname>
 			will NOT be copied to or from an AMQP Message, unless explicitly specified
 			by the <emphasis>requestHeaderNames</emphasis> and/or
 			<emphasis>replyHeaderNames</emphasis> properties of the
diff --git a/src/reference/docbook/changes-2.0-2.1.xml b/src/reference/docbook/changes-2.0-2.1.xml
index c627819442..55af1505f1 100644
--- a/src/reference/docbook/changes-2.0-2.1.xml
+++ b/src/reference/docbook/changes-2.0-2.1.xml
@@ -29,7 +29,7 @@
 		    <title>GemFire Support</title>
 		    <para>
 		        Spring Integration provides support for
-		        <ulink url="http://www.vmware.com/products/vfabric-gemfire/overview.html">GemFire</ulink> by providing
+		        <ulink url="http://www.vmware.com/products/application-platform/vfabric-gemfire/overview.html">GemFire</ulink> by providing
 		        inbound adapters for entry and continuous query events, an outbound
 		        adapter to write entries to the cache, and
 		        <ulink url="http://static.springsource.org/spring-integration/api/org/springframework/integration/store/MessageStore.html">
diff --git a/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml
index 196b88889e..fa397663e2 100644
--- a/src/reference/docbook/jdbc.xml
+++ b/src/reference/docbook/jdbc.xml
@@ -48,7 +48,7 @@
     a generic mapper that just returns a <classname>Map</classname> for each
     row in the query result. Optionally, this can be changed by adding a reference to
     a <classname>RowMapper</classname> instance (see the
-    <ulink url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/jdbc.html">Spring
+    <ulink url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/jdbc.html">Spring
     JDBC</ulink> documentation for more detailed information about row mapping).
 	</para>
 	<note>
@@ -442,7 +442,7 @@
 		package: there is a create and a drop script example for a range of common
       database platforms. A common way to use these scripts is to reference
       them in a <ulink
-      url="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/jdbc.html#d0e24182">Spring
+      url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/jdbc.html#jdbc-intializing-datasource">Spring
       JDBC data source initializer</ulink>. Note that the scripts are provided
       as samples or specifications of the the required table and column names.
       You may find that you need to enhance them for production use (e.g. with
diff --git a/src/reference/docbook/router.xml b/src/reference/docbook/router.xml
index 1bc5116a14..3c2f4110bc 100644
--- a/src/reference/docbook/router.xml
+++ b/src/reference/docbook/router.xml
@@ -686,14 +686,15 @@
             You may also find <emphasis>Collection Projection</emphasis> and <emphasis>Collection Selection</emphasis>
             expressions useful to select multiple channels. For further information,
             please see:
-
-            <itemizedlist>
-                <listitem>
-                    <ulink url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/expressions.html#d0e12084"/>
-                </listitem>
-            </itemizedlist>
-        </para>
-
+		</para>
+		<itemizedlist>
+			<listitem>
+				<ulink url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/expressions.html#expressions-collection-projection">Collection Projection</ulink>
+			</listitem>
+			<listitem>
+				<ulink url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/expressions.html#expressions-collection-selection">Collection Selection</ulink>
+			</listitem>
+		</itemizedlist>
         </section>
 
         <section id="router-annotation">