diff --git a/docs/src/info/changelog.txt b/docs/src/info/changelog.txt
index 9313930b..e226a2dd 100644
--- a/docs/src/info/changelog.txt
+++ b/docs/src/info/changelog.txt
@@ -2,6 +2,12 @@ SPRING DATA GEMFIRE CHANGELOG
=============================
http://www.springsource.org/spring-gemfire
+Changes in version 1.2.1.RELEASE (2012-10-26)
+---------------------------------------------
+General
+* Upgraded to GemFire 7.0
+* Added support for GemFire 7.0 WAN Configuration
+
Changes in version 1.2.0.RELEASE (2012-08-15)
---------------------------------------------
General
diff --git a/docs/src/reference/docbook/reference/cache.xml b/docs/src/reference/docbook/reference/cache.xml
index 78dbb1f2..8711499d 100644
--- a/docs/src/reference/docbook/reference/cache.xml
+++ b/docs/src/reference/docbook/reference/cache.xml
@@ -68,7 +68,7 @@
In addition to referencing an external configuration file one can
specify GemFire properties
+ url="http://pubs.vmware.com/vfabricNoSuite/topic/com.vmware.vfabric.gemfire.7.0/reference/topics/gemfire_properties.html">properties
using any of Spring's common properties support features. For example, one
can use the properties element defined in the
util namespace to define properties directly or load
@@ -142,19 +142,19 @@
TransactionListener callback
declaration using a bean reference. The referenced bean must implement
TransactionListener
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/TransactionListener.html">TransactionListener
An example of a TransactionWriter
callback declaration using an inner bean declaration this time. The
bean must implement TransactionWriter
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/TransactionWriter.html">TransactionWriter
Enable GemFire's DynamicRegionFactory
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/DynamicRegionFactory.html">DynamicRegionFactory
@@ -205,7 +205,7 @@
In Spring Data GemFire 1.1 dedicated support for configuring a
CacheServer
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/server/CacheServer.html">CacheServer
was added, allowing complete configuration through the Spring
container:
@@ -276,7 +276,7 @@
Another configuration addition in Spring Data GemFire 1.1 is the
dedicated support for configuring ClientCache.
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/client/ClientCache.html">ClientCache.
This is similar to a cache in both
usage and definition and supported by
org.springframework.data.gemfire.clientClientCacheFactoryBean.
@@ -310,5 +310,5 @@
Client side configuration is covered in more detail in .
+ linkend="bootstrap:region:client"/>.
diff --git a/docs/src/reference/docbook/reference/cq-container.xml b/docs/src/reference/docbook/reference/cq-container.xml
index 024767de..d070686d 100644
--- a/docs/src/reference/docbook/reference/cq-container.xml
+++ b/docs/src/reference/docbook/reference/cq-container.xml
@@ -47,7 +47,7 @@
The ContinuousQueryListenerAdapter class is the
final component in Spring Data GemFire CQ support: in a nutshell, it allows you to expose almost any class
as a EDP (there are of course some constraints) - it implements ContinuousQueryListener, a simpler listener interface
- similar to GemFire CqListener.
+ similar to GemFire CqListener.
Consider the following interface definition. Notice the
various event handling methods and their parameters:
diff --git a/docs/src/reference/docbook/reference/data.xml b/docs/src/reference/docbook/reference/data.xml
index 607a9b1e..70aeff87 100644
--- a/docs/src/reference/docbook/reference/data.xml
+++ b/docs/src/reference/docbook/reference/data.xml
@@ -120,7 +120,7 @@
through the copyOnRead property. For more information
on the semantics of the underlying GemFire transaction manager, see the
GemFire documentation.
+ url="https://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/CacheTransactionManager.html">documentation.
diff --git a/docs/src/reference/docbook/reference/region.xml b/docs/src/reference/docbook/reference/region.xml
index e3af4793..fbf6a56c 100644
--- a/docs/src/reference/docbook/reference/region.xml
+++ b/docs/src/reference/docbook/reference/region.xml
@@ -53,7 +53,7 @@
For more information about the various region types and their
capabilities as well as configuration options, please refer to the GemFire
Developer's Guide
+ url="http://pubs.vmware.com/vfabricNoSuite/index.jsp?topic=/com.vmware.vfabric.gemfire.7.0/developing/book_intro.html">Guide
and community site.
@@ -118,7 +118,7 @@
Client Region <client-region>
For a comprehensive description of region
+ url="http://pubs.vmware.com/vfabricNoSuite/topic/com.vmware.vfabric.gemfire.7.0/developing/region_options/region_types.html">region
types please consult the GemFire product documentation.
@@ -175,7 +175,7 @@
See GemFire's Data
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/DataPolicy.html">Data
Policy
@@ -354,7 +354,7 @@
Cache Listeners are registered with a region to handle region
events such as entries being created, updated, destroyed, etc. A Cache
Listener can be any bean that implements the
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/CacheListener.html">
CacheListener interface. A region may have multiple listeners, declared
using the cache-listener element enclosed in a
@@ -426,10 +426,10 @@
source. The difference is GemFire only supports at most a single
instance of each for each region. However, either declaration style may
be used. See
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/CacheLoader.html">
CacheLoader and
+ url="http://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/cache/CacheWriter.html">
CacheWriter for more details.
@@ -535,7 +535,7 @@
For a detailed description of eviction policies, see the GemFire
documentation (such as this
+ url="http://pubs.vmware.com/vfabricNoSuite/topic/com.vmware.vfabric.gemfire.7.0/developing/eviction/how_eviction_works.html">this
page).
diff --git a/docs/src/reference/docbook/reference/serialization.xml b/docs/src/reference/docbook/reference/serialization.xml
index dc5a1e7d..e34c16f8 100644
--- a/docs/src/reference/docbook/reference/serialization.xml
+++ b/docs/src/reference/docbook/reference/serialization.xml
@@ -22,7 +22,7 @@
lives at a certain point in time, for example a DataSource. Serializing
such information is useless (and potentially even dangerous) since it is
local to a certain VM/machine. For such cases, Spring Data GemFire offers a special Instantiator
+ url="https://www.vmware.com/support/developer/vfabric-gemfire/700-api/com/gemstone/gemfire/Instantiator.html">Instantiator
that performs wiring for each new instance created by GemFire during
deserialization.
@@ -31,7 +31,7 @@
from persistent data and have rich domain objects in
a transparent manner (Spring users might find this approach similar to
that of @Configurable).
+ url="http://static.springsource.org/spring/docs/current/spring-framework-reference/html/aop.html#aop-atconfigurable">@Configurable).
The WiringInstantiator works just like
WiringDeclarableSupport, trying to first locate a
bean definition as a wiring template and following to autowiring