You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2016/05/31 17:11:11 UTC

[26/29] incubator-geode git commit: GEODE-1316: Changing @since tags to @GemFire or @Geode

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
index 97277e1..dce9e5d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.admin.internal.GemFireHealthConfigImpl;
  * @see GemFireHealthJmxImpl#createDistributedSystemHealthConfig
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 @edu.umd.cs.findbugs.annotations.SuppressWarnings(justification="This class is deprecated. Also, any further changes so close to the release is inadvisable.") 
 public class GemFireHealthConfigJmxImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthJmxImpl.java
index c6d8f27..1cf931a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GemFireHealthJmxImpl.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * @see AdminDistributedSystemJmxImpl#createGemFireHealth
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class GemFireHealthJmxImpl extends GemFireHealthImpl 
   implements ManagedResource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GenerateMBeanHTML.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GenerateMBeanHTML.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GenerateMBeanHTML.java
index ab68ea9..f887a23 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GenerateMBeanHTML.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/GenerateMBeanHTML.java
@@ -31,7 +31,7 @@ import java.io.*;
  * Jakarta Commons Modeler and generates an HTML file that documents
  * each MBean.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class GenerateMBeanHTML extends DefaultHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MBeanUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MBeanUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MBeanUtil.java
index 7d9c179..b16d2bd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MBeanUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MBeanUtil.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * Common support for MBeans and {@link ManagedResource}s.  Static loading of
  * this class creates the MBeanServer and Modeler Registry.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class MBeanUtil {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
index 7649b80..3badf0f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * <a href="http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html">
  * http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html</a>
  *
- * @since     3.5 (old name was SSLAdaptorServerSocketFactory)
+ * @since GemFire     3.5 (old name was SSLAdaptorServerSocketFactory)
  */
 public class MX4JServerSocketFactory 
 implements mx4j.tools.adaptor.AdaptorServerSocketFactory,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MailManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MailManager.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MailManager.java
index f6b9129..53a50d6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MailManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MailManager.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * provides the way to add/remove email ids. Can be used to send email in case
  * of any alerts raised / warning / failure in gemfire.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class MailManager {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResource.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResource.java
index 0df53b0..f2ecba5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResource.java
@@ -23,7 +23,7 @@ import javax.management.modelmbean.ModelMBean;
  * Represents a component or resource that is managed by a 
  * {@link javax.management.modelmbean.ModelMBean}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public interface ManagedResource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResourceType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResourceType.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResourceType.java
index e547d46..69a70e2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResourceType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ManagedResourceType.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin.jmx.internal;
  * ({@link #getClassTypeName}) must match the fully qualified class name listed
  * in the type descriptor in mbeans-descriptors.xml.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class ManagedResourceType implements java.io.Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
index 17091ed..646c8d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -81,7 +81,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * defined for Admin Distributed System. 
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class MemberInfoWithStatsMBean extends AbstractDynamicMBean 
                                  implements NotificationEmitter {
@@ -1253,7 +1253,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
  * notifications.
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 class NotificationForwarder extends NotificationBroadcasterSupport 
   implements NotificationListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/RefreshNotificationType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/RefreshNotificationType.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/RefreshNotificationType.java
index f10bccc..3b4271d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/RefreshNotificationType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/RefreshNotificationType.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.admin.jmx.internal;
 /**
  * Type-safe definition for refresh notifications.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class RefreshNotificationType implements java.io.Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatAlertNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatAlertNotification.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatAlertNotification.java
index b33972d..8a35ba9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatAlertNotification.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatAlertNotification.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.admin.StatAlertDefinition;
  * @see StatAlert raised and also Gemfire member id which raised the alert
  * 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class StatAlertNotification extends StatAlert implements Serializable, DataSerializable, DataSerializableFixedID {
   private static final long serialVersionUID = -1634729103430107871L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticAttributeInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticAttributeInfo.java
index aa977e5..ddd2cfb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticAttributeInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticAttributeInfo.java
@@ -29,7 +29,7 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo;
  * javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's 
  * <i>targetObject</i> value.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 class StatisticAttributeInfo extends org.apache.commons.modeler.AttributeInfo {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticResourceJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticResourceJmxImpl.java
index 7a439d8..6e79ad8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Provides MBean support for the monitoring of a statistic resource.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class StatisticResourceJmxImpl 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
index ba5c6b2..ad94396 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
@@ -29,7 +29,7 @@ import javax.management.modelmbean.ModelMBean;
  * MBean representation of a {@link
  * com.gemstone.gemfire.admin.SystemMemberBridgeServer}. 
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class SystemMemberBridgeServerJmxImpl
   extends SystemMemberBridgeServerImpl implements ManagedResource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index 88ba3db..2e32f8f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 /**
  * MBean representation of {@link com.gemstone.gemfire.admin.SystemMemberCache}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class SystemMemberCacheJmxImpl 
 extends com.gemstone.gemfire.admin.internal.SystemMemberCacheImpl
@@ -259,7 +259,7 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    * Creates a new cache server MBean and returns its
    * <code>ObjectName</code>.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public ObjectName manageCacheServer()
     throws AdminException, MalformedObjectNameException {
@@ -295,7 +295,7 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    * Returns the MBean <code>ObjectName</code>s for all cache servers
    * that serve this cache to clients.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public ObjectName[] manageCacheServers()
     throws AdminException, MalformedObjectNameException {
@@ -337,7 +337,7 @@ implements com.gemstone.gemfire.admin.jmx.internal.ManagedResource {
    * Returns the MBean <code>ObjectName</code>s for all bridge servers
    * that serve this cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    * @deprecated as of 5.7
    */
   @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmx.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmx.java
index 9cf3ff6..aa06cc6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmx.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Defines methods that all <code>SystemMember</code> MBeans should
  * implement.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface SystemMemberJmx
   extends SystemMember, NotificationListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmxImpl.java
index 1765348..103dbe1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberJmxImpl.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * Wrap all delegate calls w/ e.printStackTrace() since the HttpAdaptor devours 
  * them
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class SystemMemberJmxImpl 
@@ -113,7 +113,7 @@ implements SystemMemberJmx, javax.management.NotificationListener,
    * @throws AdminException
    *           if construction of SystemMember fails
    *           
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system,
       InternalDistributedMember member) throws AdminException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberRegionJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberRegionJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberRegionJmxImpl.java
index c5879c0..d7b4d5b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberRegionJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/SystemMemberRegionJmxImpl.java
@@ -27,7 +27,7 @@ import javax.management.modelmbean.ModelMBean;
  * MBean representation of {@link 
  * com.gemstone.gemfire.admin.SystemMemberRegion}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class SystemMemberRegionJmxImpl 
 extends com.gemstone.gemfire.admin.internal.SystemMemberRegionImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
index c622255..c773c96 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
@@ -360,7 +360,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see AttributesMutator
  * @see Region#createSubregion(String, RegionAttributes)
  *
- * @since 3.0
+ * @since GemFire 3.0
  * @deprecated as of 6.5 use {@link Cache#createRegionFactory(RegionShortcut)} or {@link ClientCache#createClientRegionFactory(ClientRegionShortcut)} instead.
  */
 @SuppressWarnings("synthetic-access")
@@ -370,7 +370,7 @@ public class AttributesFactory<K,V> {
   /**
    * The default disk synchronous write setting
    * <p>Current value: <code>true</code> each.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final boolean DEFAULT_DISK_SYNCHRONOUS = true;
   
@@ -540,7 +540,7 @@ public class AttributesFactory<K,V> {
    * Adds a cache listener to the end of the list of cache listeners on this factory.
    * @param aListener the cache listener to add to the factory.
    * @throws IllegalArgumentException if <code>aListener</code> is null
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void addCacheListener(CacheListener<K,V> aListener) {
     if (aListener == null) {
@@ -554,7 +554,7 @@ public class AttributesFactory<K,V> {
    * Removes all cache listeners and then adds each listener in the specified array.
    * @param newListeners a possibly null or empty array of listeners to add to this factory.
    * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void initCacheListeners(CacheListener<K,V>[] newListeners) {
     synchronized (this.regionAttributes) {
@@ -844,7 +844,7 @@ public class AttributesFactory<K,V> {
   /**
    * Enables or disabled concurrent modification checks.  Concurrency checks are enabled
    * by default.
-   * @since 7.0
+   * @since GemFire 7.0
    * @param concurrencyChecksEnabled whether to perform concurrency checks on operations
    */
   public void setConcurrencyChecksEnabled(boolean concurrencyChecksEnabled) {
@@ -856,7 +856,7 @@ public class AttributesFactory<K,V> {
    * Sets whether or not a persistent backup should be made of the
    * region.
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of GemFire 5.0, use {@link DataPolicy#PERSISTENT_REPLICATE} instead
    */
   @Deprecated
@@ -883,7 +883,7 @@ public class AttributesFactory<K,V> {
   /**
    * Sets whether or not acks are sent after an operation is processed.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    * @deprecated This setting no longer has any effect. 
    */
   @Deprecated
@@ -895,7 +895,7 @@ public class AttributesFactory<K,V> {
   /**
    * Sets whether or not this region should be considered a publisher.
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    * @deprecated as of 6.5
    */
   @Deprecated
@@ -909,7 +909,7 @@ public class AttributesFactory<K,V> {
    * to async peers.
    * Default value is false.
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void setEnableAsyncConflation(boolean enableAsyncConflation) {
     this.regionAttributes.enableAsyncConflation = enableAsyncConflation;
@@ -922,7 +922,7 @@ public class AttributesFactory<K,V> {
    * from a cache server to its clients.
    * Default is false.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setEnableSubscriptionConflation(boolean enableSubscriptionConflation) {
     this.regionAttributes.enableSubscriptionConflation = enableSubscriptionConflation;
@@ -933,7 +933,7 @@ public class AttributesFactory<K,V> {
    * adds a gateway sender to the end of list of gateway senders on this factory
    * @param gatewaySenderId
    * @throws IllegalArgumentException if <code>gatewaySender</code> is null
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public void addGatewaySenderId(String gatewaySenderId) {
     if (gatewaySenderId == null) {
@@ -948,7 +948,7 @@ public class AttributesFactory<K,V> {
    * Adds a AsyncEventQueue to the end of list of async event queues on this factory
    * @param asyncEventQueueId
    * @throws IllegalArgumentException if <code>gatewaySender</code> is null
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public void addAsyncEventQueueId(String asyncEventQueueId) {
     if (asyncEventQueueId == null) {
@@ -963,7 +963,7 @@ public class AttributesFactory<K,V> {
    * Sets whether or not conflation is enabled for sending messages
    * from a cache server to its clients.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated as of 5.7 use {@link #setEnableSubscriptionConflation} instead.
    */
   @Deprecated
@@ -987,7 +987,7 @@ public class AttributesFactory<K,V> {
    *
    * @see Region#writeToDisk
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of 6.5 use {@link #setDiskStoreName} instead
    */
   @Deprecated
@@ -1010,7 +1010,7 @@ public class AttributesFactory<K,V> {
    *
    * @throws GemFireIOException if a directory does not exist
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirs} instead
    */
   @Deprecated
@@ -1038,7 +1038,7 @@ public class AttributesFactory<K,V> {
    * Sets the DiskStore name attribute.
    * This causes the region to use the {@link DiskStore}.
    * @param name the name of the diskstore
-   * @since 6.5 
+   * @since GemFire 6.5
    */
   public void setDiskStoreName(String name) {
     if (this.regionAttributes.hasDiskDirs() ||  this.regionAttributes.hasDiskWriteAttributes()) {
@@ -1055,7 +1055,7 @@ public class AttributesFactory<K,V> {
    * 
    * @param isSynchronous
    *          boolean if true indicates synchronous writes
-   * @since 6.5 
+   * @since GemFire 6.5
    */
   @SuppressWarnings("deprecation")
   public void setDiskSynchronous(boolean isSynchronous)
@@ -1081,7 +1081,7 @@ public class AttributesFactory<K,V> {
    * @throws IllegalArgumentException if a dir does not exist or the length of the size array
    * does not match to the length of the dir array or the given length is not a valid positive number
    *
-   * @since 5.1
+   * @since GemFire 5.1
    * @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirsAndSizes} instead
    */
   @Deprecated
@@ -1112,7 +1112,7 @@ public class AttributesFactory<K,V> {
    * also establishes a data policy of {@link DataPolicy#PARTITION PARTITION},
    * if the data policy has not already been set.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setPartitionAttributes(PartitionAttributes partition) {
     if (partition != null) {
@@ -1162,7 +1162,7 @@ public class AttributesFactory<K,V> {
    * Sets the <code>SubscriptionAttributes</code> that describe how the region
    * will subscribe to other distributed cache instances of the region.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setSubscriptionAttributes(SubscriptionAttributes subscription) {
     this.regionAttributes.subscriptionAttributes = subscription;
@@ -1192,7 +1192,7 @@ public class AttributesFactory<K,V> {
   /**
    * Sets the flag telling a region to ignore JTA transactions.
    * Default is false.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setIgnoreJTA(boolean flag) {
     this.regionAttributes.ignoreJTA = flag;
@@ -1213,7 +1213,7 @@ public class AttributesFactory<K,V> {
       cache's DistributedSystem (see
       <a href=../distributed/DistributedSystem.html#mcast-port">"mcast-port"</a>).
       Default is false.
-      @since 5.0
+      @since GemFire 5.0
       @see RegionAttributes#getMulticastEnabled
    */
   public void setMulticastEnabled(boolean value) {
@@ -1226,7 +1226,7 @@ public class AttributesFactory<K,V> {
    * Note: off-heap regions always behave as if cloning is enabled.
    * 
    * @param cloningEnable
-   * @since 6.1
+   * @since GemFire 6.1
    * @see RegionAttributes#getCloningEnabled()
    */
   public void setCloningEnabled(boolean cloningEnable) {
@@ -1249,7 +1249,7 @@ public class AttributesFactory<K,V> {
    * @param name the name of the connection pool to use; if <code>null</code>
    * or <code>""</code> then the connection pool is disabled for regions
    * using these attributes.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setPoolName(String name) {
     String nm = name;
@@ -1263,7 +1263,7 @@ public class AttributesFactory<K,V> {
   
   /**
    * Sets this region's compressor for compressing entry values.
-   * @since 8.0
+   * @since GemFire 8.0
    * @param compressor a compressor.
    */
   public void setCompressor(Compressor compressor) {
@@ -1278,7 +1278,7 @@ public class AttributesFactory<K,V> {
 
   /**
    * Enables this region's usage of off-heap memory if true.
-   * @since 9.0
+   * @since Geode 1.0
    * @param offHeap boolean flag to enable off-heap memory
    */
   public void setOffHeap(boolean offHeap) {
@@ -1306,7 +1306,7 @@ public class AttributesFactory<K,V> {
    * @return the newly created <code>RegionAttributes</code>
    * @throws IllegalStateException if the current settings violate the
    * <a href="#compatibility">compatibility rules</a>
-   * @since 5.0
+   * @since GemFire 5.0
    */
   @SuppressWarnings("unchecked")
   public RegionAttributes<K,V> create() {
@@ -1381,7 +1381,7 @@ public class AttributesFactory<K,V> {
    </ul>
    * @param attrs the attributes to validate
    * @throws IllegalStateException if the attributes are not consistent with each other.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public static void validateAttributes(RegionAttributes<?, ?> attrs) {
     // enforce the creation constraints

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
index 27d161d..6b31759 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
@@ -33,7 +33,7 @@ package com.gemstone.gemfire.cache;
  * @see Region#getAttributesMutator
  * @see RegionAttributes
  * @see AttributesFactory
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface AttributesMutator<K,V> {
   
@@ -118,7 +118,7 @@ public interface AttributesMutator<K,V> {
    * Adds a cache listener to the end of the list of cache listeners on this region.
    * @param aListener the user defined cache listener to add to the region.
    * @throws IllegalArgumentException if <code>aListener</code> is null
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void addCacheListener(CacheListener<K,V> aListener);
   /**
@@ -128,14 +128,14 @@ public interface AttributesMutator<K,V> {
    * be called on it; otherwise does nothing.
    * @param aListener the cache listener to remove from the region.
    * @throws IllegalArgumentException if <code>aListener</code> is null
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void removeCacheListener(CacheListener<K,V> aListener);
   /**
    * Removes all cache listeners, calling {@link CacheCallback#close} on each of them, and then adds each listener in the specified array.
    * @param newListeners a possibly null or empty array of listeners to add to this region.
    * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void initCacheListeners(CacheListener<K,V>[] newListeners);
   
@@ -169,7 +169,7 @@ public interface AttributesMutator<K,V> {
    * Sets cloning on region
    * Note: off-heap regions always behave as if cloning is enabled.
    * @param cloningEnable
-   * @since 6.1
+   * @since GemFire 6.1
    */
   public void setCloningEnabled(boolean cloningEnable);
   /**
@@ -178,7 +178,7 @@ public interface AttributesMutator<K,V> {
    * @return True if cloning is enabled (default);
    *         false cloning is not enabled.
    *
-   * @since 6.1
+   * @since GemFire 6.1
    */
   public boolean getCloningEnabled();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
index 03874b3..a17fdd2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
  * <p>A cache can have multiple root regions, each with a different name.
  *
  *
- * @since 2.0
+ * @since GemFire 2.0
  */
 @SuppressWarnings("deprecation")
 public interface Cache extends GemFireCache {
@@ -109,7 +109,7 @@ public interface Cache extends GemFireCache {
    * @throws IllegalStateException If the supplied RegionAttributes violate the
    *         <a href="AttributesFactory.html#creationConstraints">region creation constraints</a>
    *         with a region of the same name in another cache in the distributed system
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated as of 6.5 use {@link #createRegionFactory(RegionAttributes)} instead
    */
   @Deprecated
@@ -120,14 +120,14 @@ public interface Cache extends GemFireCache {
    * Creates a {@link RegionFactory} which can be used to specify additional
    * attributes for {@link Region} creation.
    * @see #createRegionFactory(RegionShortcut)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory();
   
   /**
    * Creates a {@link RegionFactory} for the most commonly used {@link Region} types
    * defined by {@link RegionShortcut}
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(RegionShortcut atts);
   
@@ -136,7 +136,7 @@ public interface Cache extends GemFireCache {
    * {@link RegionAttributes} mapped to this regionAttributesId
    * @param regionAttributesId the Id of RegionAttributes to be used
    * @see #setRegionAttributes(String, RegionAttributes)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(String regionAttributesId);
   
@@ -145,7 +145,7 @@ public interface Cache extends GemFireCache {
    * the given regionAttributes
    * @param regionAttributes regionAttributes for the new region
    * @see #createRegionFactory(RegionShortcut)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(RegionAttributes<K,V> regionAttributes);
   
@@ -249,7 +249,7 @@ public interface Cache extends GemFireCache {
    * 
    * @see com.gemstone.gemfire.cache.server.CacheServer
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheServer addCacheServer();
 
@@ -259,7 +259,7 @@ public interface Cache extends GemFireCache {
    *
    * @see #addCacheServer
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public List<CacheServer> getCacheServers();
   
@@ -272,13 +272,13 @@ public interface Cache extends GemFireCache {
    * it is the same and the event's distributed system ID is larger than that
    * of the last event to modify the affected entry.
    * @param resolver
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public void setGatewayConflictResolver(GatewayConflictResolver resolver);
   
   /**
    * Returns the current gateway event conflict resolver
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public GatewayConflictResolver getGatewayConflictResolver();
   
@@ -290,7 +290,7 @@ public interface Cache extends GemFireCache {
    * administration API} or the <code>cacheserver</code> command line
    * utility.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setIsServer(boolean isServer);
 
@@ -299,7 +299,7 @@ public interface Cache extends GemFireCache {
    *
    * @see #setIsServer
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isServer();
 
@@ -317,7 +317,7 @@ public interface Cache extends GemFireCache {
    *
    * @throws IllegalStateException if called by a non-durable client
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @deprecated as of 6.5 use {@link ClientCache#readyForEvents} instead.
    */
   @Deprecated
@@ -328,7 +328,7 @@ public interface Cache extends GemFireCache {
    * SerialGatewaySender
    * 
    * @return SerialGatewaySenderFactory
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public GatewaySenderFactory createGatewaySenderFactory();
 
@@ -337,7 +337,7 @@ public interface Cache extends GemFireCache {
    * AsyncEventQueue
    * 
    * @return AsyncEventQueueFactory
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public AsyncEventQueueFactory createAsyncEventQueueFactory();
   
@@ -345,7 +345,7 @@ public interface Cache extends GemFireCache {
    * Creates {@link GatewayReceiverFactory} for creating a GatewayReceiver
    * 
    * @return GatewayReceiverFactory
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public GatewayReceiverFactory createGatewayReceiverFactory();
 
@@ -353,7 +353,7 @@ public interface Cache extends GemFireCache {
    * Returns all {@link GatewaySender}s for this Cache. 
    * 
    * @return Set of GatewaySenders
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public Set<GatewaySender> getGatewaySenders();
 
@@ -361,14 +361,14 @@ public interface Cache extends GemFireCache {
    * Returns the {@link GatewaySender} with the given id added to this Cache.
    * 
    * @return GatewaySender with id
-   * @since 7.0
+   * @since GemFire 7.0
    */  
   public GatewaySender getGatewaySender(String id);
   /**
    * Returns all {@link GatewayReceiver}s for this Cache
    * 
    * @return Set of GatewaySenders
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public Set<GatewayReceiver> getGatewayReceivers();
   
@@ -376,7 +376,7 @@ public interface Cache extends GemFireCache {
    * Returns all {@link AsyncEventQueue}s for this Cache
    * 
    * @return Set of AsyncEventQueue
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public Set<AsyncEventQueue> getAsyncEventQueues(); 
   
@@ -384,19 +384,19 @@ public interface Cache extends GemFireCache {
    * Returns the {@link AsyncEventQueue} with the given id added to this Cache.
    * 
    * @return AsyncEventQueue with id
-   * @since 7.0
+   * @since GemFire 7.0
    */  
   public AsyncEventQueue getAsyncEventQueue(String id);
 
   /**
    * Returns a set of the other non-administrative members in the distributed system.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Set<DistributedMember> getMembers();
   
   /**
    * Returns a set of the administrative members in the distributed system.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Set<DistributedMember> getAdminMembers();
   
@@ -404,7 +404,7 @@ public interface Cache extends GemFireCache {
    * Returns a set of the members in the distributed system that have the
    * given region.  For regions with local scope an empty set is returned.
    * @param r a Region in the cache
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Set<DistributedMember> getMembers(Region r);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheCallback.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheCallback.java
index 5a45bb8..eae82ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheCallback.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheCallback.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache;
  * notifications.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface CacheCallback {
   /** Called when the region containing this callback is closed or destroyed, when

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheClosedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheClosedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheClosedException.java
index e747299..f72dbe7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheClosedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheClosedException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
  *
  *
  * @see Cache
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheClosedException extends CancelException {
 private static final long serialVersionUID = -6479561694497811262L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheEvent.java
index d2edb20..8ee1a7f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheEvent.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
  *
  *
  *
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface CacheEvent<K,V> {
 
@@ -49,7 +49,7 @@ public interface CacheEvent<K,V> {
   /**
    * Return a description of the operation that triggered this event.
    * @return the operation that triggered this event.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public Operation getOperation();
   
@@ -69,7 +69,7 @@ public interface CacheEvent<K,V> {
    * not be obtained.
    * Note that {@link #getCallbackArgument} will return <code>null</code>
    * when this method returns <code>false</code>.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isCallbackArgumentAvailable();
 
@@ -82,7 +82,7 @@ public interface CacheEvent<K,V> {
   /**
    * Returns the {@link DistributedMember} that this event originated in.
    * @return the member that performed the operation that originated this event.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public DistributedMember getDistributedMember();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheException.java
index 84efa78..e21b45b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheException.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.GemFireException;
  * subclasses are instantiated.
  *
  *
- * @since 2.0
+ * @since GemFire 2.0
  */
 public abstract class CacheException extends GemFireException {
   /** Constructs a new <code>CacheException</code>. */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheExistsException.java
index 982b2c4..4292d03 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheExistsException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache;
  *
  *
  * @see CacheFactory#create
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheExistsException extends CacheException {
 private static final long serialVersionUID = 4090002289325418100L;
@@ -57,7 +57,7 @@ private static final long serialVersionUID = 4090002289325418100L;
   /**
    * Returns the <code>Cache</code> that already exists.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Cache getCache() {
     return this.cache;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
index bd3b55f..a5bcf59 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
@@ -76,7 +76,7 @@ Applications that need to explicitly control the individual region attributes ca
  *
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheFactory {
 
@@ -86,7 +86,7 @@ public class CacheFactory {
        
   /**
    * Creates a default cache factory.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public CacheFactory() {
     this(null);
@@ -95,7 +95,7 @@ public class CacheFactory {
    * Create a CacheFactory initialized with the given gemfire properties.
    * For a list of valid gemfire properties see {@link DistributedSystem}.
    * @param props the gemfire properties to initialize the factory with.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public CacheFactory(Properties props) {
     if (props == null) {
@@ -110,7 +110,7 @@ public class CacheFactory {
    * @param name the name of the gemfire property
    * @param value the value of the gemfire property
    * @return a reference to this CacheFactory object
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public CacheFactory set(String name, String value) {
     this.dsProps.setProperty(name, value);
@@ -209,7 +209,7 @@ public class CacheFactory {
    * @throws AuthenticationFailedException if authentication fails.
    * @throws AuthenticationRequiredException if the distributed system is in secure mode 
    *         and this new member is not configured with security credentials.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public Cache create()
     throws TimeoutException, CacheWriterException,
@@ -247,7 +247,7 @@ public class CacheFactory {
    * @param system the <code>DistributedSystem</code> the cache was created with.
    * @return the {@link Cache} associated with the specified system.
    * @throws CacheClosedException if a cache has not been created
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public static Cache getInstanceCloseOk(DistributedSystem system) {
     return basicGetInstance(system, true);
@@ -319,7 +319,7 @@ public class CacheFactory {
    *  
    *  @param readSerialized true to prefer PdxInstance
    *  @return this CacheFactory 
-   *  @since 6.6
+   *  @since GemFire 6.6
    *  @see com.gemstone.gemfire.pdx.PdxInstance 
    */
   public  CacheFactory setPdxReadSerialized(boolean readSerialized) {
@@ -333,7 +333,7 @@ public class CacheFactory {
    * added to the cache in portable data exchange format. 
    * @param serializer the serializer to use
    * @return this CacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    * @see PdxSerializer
    */
   public CacheFactory setPdxSerializer(PdxSerializer serializer) {
@@ -351,7 +351,7 @@ public class CacheFactory {
    * @param diskStoreName the name of the disk store to use
    * for the PDX metadata.
    * @return this CacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public CacheFactory setPdxDiskStore(String diskStoreName) {
     this.cacheConfig.setPdxDiskStore(diskStoreName);
@@ -368,7 +368,7 @@ public class CacheFactory {
    * @param isPersistent
    *          true if the metadata should be persistent
    * @return this CacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public CacheFactory setPdxPersistent(boolean isPersistent) {
     this.cacheConfig.setPdxPersistent(isPersistent);
@@ -386,7 +386,7 @@ public class CacheFactory {
    * @param ignore <code>true</code> if fields not read during pdx deserialization should be ignored;
    * <code>false</code>, the default, if they should be preserved.
    * @return this CacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public CacheFactory setPdxIgnoreUnreadFields(boolean ignore) {
     this.cacheConfig.setPdxIgnoreUnreadFields(ignore);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheListener.java
index 4c73bfc..16966ff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheListener.java
@@ -66,7 +66,7 @@ package com.gemstone.gemfire.cache;
  * @see AttributesMutator#addCacheListener
  * @see AttributesMutator#removeCacheListener
  * @see AttributesMutator#initCacheListeners
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface CacheListener<K,V> extends CacheCallback {
 
@@ -142,7 +142,7 @@ public interface CacheListener<K,V> extends CacheCallback {
    * @param event the RegionEvent
    *
    * @see Region#clear
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void afterRegionClear(RegionEvent<K,V> event);
   
@@ -157,7 +157,7 @@ public interface CacheListener<K,V> extends CacheCallback {
    *
    * @see Cache#createRegion
    * @see Region#createSubregion
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void afterRegionCreate(RegionEvent<K,V> event);
 
@@ -167,7 +167,7 @@ public interface CacheListener<K,V> extends CacheCallback {
    * @param event the RegionEvent
    * 
    * @see Cache#readyForEvents
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void afterRegionLive(RegionEvent<K,V> event);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoader.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoader.java
index cdcf202..2def607 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoader.java
@@ -33,7 +33,7 @@ package com.gemstone.gemfire.cache;
  * @see AttributesFactory#setCacheLoader
  * @see RegionAttributes#getCacheLoader
  * @see AttributesMutator#setCacheLoader
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface CacheLoader<K,V> extends CacheCallback {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoaderException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoaderException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoaderException.java
index 239f2e3..6261923 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoaderException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheLoaderException.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.cache;
  *
  * @see com.gemstone.gemfire.cache.Region#get(Object)
  * @see CacheLoader#load
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheLoaderException extends OperationAbortedException {
 private static final long serialVersionUID = -3383072059406642140L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheRuntimeException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheRuntimeException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheRuntimeException.java
index f10c50b..5f8c71e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheRuntimeException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheRuntimeException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.GemFireException;
  * instantiated
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheRuntimeException extends GemFireException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheStatistics.java
index 0e30271..a996ae8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheStatistics.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache;
  *
  * @see Region#getStatistics
  * @see Region.Entry#getStatistics
- * @since 2.0
+ * @since GemFire 2.0
  */
 
 public interface CacheStatistics

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
index df3b508..ef9a93e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
@@ -96,7 +96,7 @@ import java.util.concurrent.TimeUnit;
  * Developer Guide for details on using transactions with Partitioned Regions.
  * 
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see Cache
  * 
@@ -106,7 +106,7 @@ public interface CacheTransactionManager {
      *
      * @throws IllegalStateException if the thread is already associated with a transaction
      *
-     * @since 4.0
+     * @since GemFire 4.0
      */
     public void begin();
 
@@ -142,7 +142,7 @@ public interface CacheTransactionManager {
      *  this method completes, the thread is no longer associated with a
      *  transaction and the transaction context is destroyed.
      *
-     * @since 4.0
+     * @since GemFire 4.0
      * 
      * @throws IllegalStateException if the thread is not associated with a transaction
      */
@@ -155,7 +155,7 @@ public interface CacheTransactionManager {
    * 
    * @return the transaction identifier of the suspended transaction or null if
    *         the thread was not associated with a transaction
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public TransactionId suspend();
 
@@ -169,7 +169,7 @@ public interface CacheTransactionManager {
    *           if the thread is associated with a transaction or if
    *           {@link #isSuspended(TransactionId)} would return false for the
    *           given transactionId
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    * @see #tryResume(TransactionId)
    */
   public void resume(TransactionId transactionId);
@@ -181,7 +181,7 @@ public interface CacheTransactionManager {
    * 
    * @param transactionId
    * @return true if the transaction is in suspended state, false otherwise
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    * @see #exists(TransactionId)
    */
   public boolean isSuspended(TransactionId transactionId);
@@ -201,7 +201,7 @@ public interface CacheTransactionManager {
    * @param transactionId
    *          the transaction to resume
    * @return true if the transaction was resumed, false otherwise
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public boolean tryResume(TransactionId transactionId);
 
@@ -224,7 +224,7 @@ public interface CacheTransactionManager {
    * @param unit
    *          the time unit of the <code>time</code> argument
    * @return true if the transaction was resumed, false otherwise
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    * @see #tryResume(TransactionId)
    */
   public boolean tryResume(TransactionId transactionId, long time, TimeUnit unit);
@@ -237,7 +237,7 @@ public interface CacheTransactionManager {
    * @param transactionId
    *          the given transaction identifier
    * @return true if the transaction is in progress, false otherwise.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    * @see #isSuspended(TransactionId)
    */
   public boolean exists(TransactionId transactionId);
@@ -246,7 +246,7 @@ public interface CacheTransactionManager {
      *
      * @return true if a transaction exists, false otherwise
      *
-     * @since 4.0
+     * @since GemFire 4.0
      */
     public boolean exists();
 
@@ -254,7 +254,7 @@ public interface CacheTransactionManager {
      *
      * @return the transaction identifier or null if no transaction exists
      *
-     * @since 4.0
+     * @since GemFire 4.0
      */
     public TransactionId getTransactionId();
 
@@ -271,7 +271,7 @@ public interface CacheTransactionManager {
     /** Returns an array of all the transaction listeners on this cache.
      * Modifications to the returned array will not effect what listeners are on this cache.
      * @return the cache's <code>TransactionListener</code>s; an empty array if no listeners
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public TransactionListener[] getListeners();
 
@@ -291,7 +291,7 @@ public interface CacheTransactionManager {
      * Adds a transaction listener to the end of the list of transaction listeners on this cache.
      * @param aListener the user defined transaction listener to add to the cache.
      * @throws IllegalArgumentException if <code>aListener</code> is null
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public void addListener(TransactionListener aListener);
     /**
@@ -301,14 +301,14 @@ public interface CacheTransactionManager {
      * be called on it; otherwise does nothing.
      * @param aListener the transaction listener to remove from the cache.
      * @throws IllegalArgumentException if <code>aListener</code> is null
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public void removeListener(TransactionListener aListener);
     /**
      * Removes all transaction listeners, calling {@link CacheCallback#close} on each of them, and then adds each listener in the specified array.
      * @param newListeners a possibly null or empty array of listeners to add to this cache.
      * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public void initListeners(TransactionListener[] newListeners);
 
@@ -316,7 +316,7 @@ public interface CacheTransactionManager {
      * Set the TransactionWriter for the cache
      * @param writer
      * @see TransactionWriter
-     * @since 6.5
+     * @since GemFire 6.5
      */
     public void setWriter(TransactionWriter writer);
 
@@ -324,7 +324,7 @@ public interface CacheTransactionManager {
      * Returns the current {@link TransactionWriter}
      * @see CacheTransactionManager#setWriter(TransactionWriter)
      * @return the current {@link TransactionWriter}
-     * @since 6.5
+     * @since GemFire 6.5
      */
     public TransactionWriter getWriter();
     
@@ -335,7 +335,7 @@ public interface CacheTransactionManager {
      * 
      * @throws IllegalStateException if a transaction is already in progress
      * and this method sets the distributed mode to a different value.
-     * @since 9.0
+     * @since Geode 1.0
      */
     public void setDistributed(boolean distributed);
     
@@ -343,7 +343,7 @@ public interface CacheTransactionManager {
      * Returns the execution mode of transactions
      * @return true if distributed,
      * false otherwise.
-     * @since 9.0
+     * @since Geode 1.0
      */
     public boolean isDistributed();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriter.java
index 732d362..574cc3b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriter.java
@@ -42,7 +42,7 @@ package com.gemstone.gemfire.cache;
  * @see AttributesFactory#setCacheWriter
  * @see RegionAttributes#getCacheWriter
  * @see AttributesMutator#setCacheWriter
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface CacheWriter<K,V> extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriterException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriterException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriterException.java
index 10fc63b..ca672ff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriterException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheWriterException.java
@@ -29,7 +29,7 @@ package com.gemstone.gemfire.cache;
  * @see com.gemstone.gemfire.cache.Region#create(Object, Object)
  * @see com.gemstone.gemfire.cache.Region#destroyRegion()
  * @see com.gemstone.gemfire.cache.Region#get(Object)
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheWriterException extends OperationAbortedException {
 private static final long serialVersionUID = -2872212342970454458L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheXmlException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheXmlException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheXmlException.java
index 51aa103..69f2430 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheXmlException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CacheXmlException.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.cache;
  * @see CacheFactory#create
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheXmlException extends CacheRuntimeException {
 private static final long serialVersionUID = -4343870964883131754L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/ClientSession.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/ClientSession.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/ClientSession.java
index 1ebccee..60673b8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/ClientSession.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/ClientSession.java
@@ -35,7 +35,7 @@ package com.gemstone.gemfire.cache;
  * clientSession.registerInterest(event.getRegion().getFullPath(), event.getKey(), InterestResultPolicy.KEYS_VALUES, true);
  * </pre>
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * @see com.gemstone.gemfire.cache.server.CacheServer#getClientSession(String)
  *      getClientSession
  * @see com.gemstone.gemfire.cache.server.CacheServer#getClientSession(com.gemstone.gemfire.distributed.DistributedMember)
@@ -81,7 +81,7 @@ public interface ClientSession {
    *          to notify-by-subscription false. The default is true.
    * @throws IllegalStateException
    *          if this is not the primary server for the given client
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void registerInterest(String regionName, Object keyOfInterest,
       InterestResultPolicy policy, boolean isDurable, boolean receiveValues);
@@ -115,7 +115,7 @@ public interface ClientSession {
    *          to notify-by-subscription false. The default is true.
    * @throws IllegalStateException
    *           if this is not the primary server for the given client
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void registerInterestRegex(String regionName, String regex,
       boolean isDurable, boolean receiveValues);
@@ -149,7 +149,7 @@ public interface ClientSession {
    *          to notify-by-subscription false. The default is true.
    * @throws IllegalStateException
    *           if this is not the primary server for the given client
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void unregisterInterest(String regionName, Object keyOfInterest,
       boolean isDurable, boolean receiveValues);
@@ -183,7 +183,7 @@ public interface ClientSession {
    *          to notify-by-subscription false. The default is true.
    * @throws IllegalStateException
    *           if this is not the primary server for the given client
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void unregisterInterestRegex(String regionName, String regex,
       boolean isDurable, boolean receiveValues);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitConflictException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitConflictException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitConflictException.java
index c417ca4..7e271e5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitConflictException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitConflictException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  *
  *
  * @see CacheTransactionManager#commit
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CommitConflictException extends TransactionException {
   private static final long serialVersionUID = -1491184174802596675L;
@@ -47,7 +47,7 @@ public class CommitConflictException extends TransactionException {
   /**
    * Constructs an instance of <code>CommitConflictException</code> with the specified cause.
    * @param cause the causal Throwable
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public CommitConflictException(Throwable cause) {
     super(cause);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitDistributionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitDistributionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitDistributionException.java
index 4cca0d6..9649bac 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitDistributionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitDistributionException.java
@@ -30,7 +30,7 @@ import java.util.*;
  * {@link MembershipAttributes#getRequiredRoles required roles} are provided
  *  in each RegionDistributionException.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class CommitDistributionException extends TransactionException {
   private static final long serialVersionUID = -3517820638706581823L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitIncompleteException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitIncompleteException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitIncompleteException.java
index 7a3d5dd..a708f42 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitIncompleteException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/CommitIncompleteException.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.cache;
 
 /**
  * Thrown when a commit fails to complete due to errors
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class CommitIncompleteException extends TransactionException {
 private static final long serialVersionUID = 1017741483744420800L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
index 80918d9..e9bde30 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
@@ -38,7 +38,7 @@ import java.io.*;
  * @see AttributesFactory#setDataPolicy
  * @see RegionAttributes#getDataPolicy
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class DataPolicy implements java.io.Serializable {
   private static final long serialVersionUID = 2095573273889467233L;
@@ -91,7 +91,7 @@ public class DataPolicy implements java.io.Serializable {
   /**
    * In addition to <code>PARTITION</code> also causes data to be stored to
    * disk. The region initialization may use the data stored on disk.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final DataPolicy PERSISTENT_PARTITION = new DataPolicy(6, "PERSISTENT_PARTITION");
   
@@ -161,7 +161,7 @@ public class DataPolicy implements java.io.Serializable {
    * @return true if this policy does persistence.
    * @see #PERSISTENT_PARTITION
    * @see #PERSISTENT_REPLICATE
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean withPersistence() {
     return this == PERSISTENT_PARTITION || this == PERSISTENT_REPLICATE;
@@ -171,7 +171,7 @@ public class DataPolicy implements java.io.Serializable {
    * @return true if this policy does partitioning
    * @see #PARTITION
    * @see #PERSISTENT_PARTITION
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean withPartitioning() {
     return this == PARTITION || this == PERSISTENT_PARTITION;
@@ -180,7 +180,7 @@ public class DataPolicy implements java.io.Serializable {
   /** Return whether this policy does preloaded.
    * @return true if this policy does preloaded.
    * @see #PRELOADED
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean withPreloaded() {
     return this == PRELOADED;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/Declarable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/Declarable.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/Declarable.java
index 94dda3b..57d0dd4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/Declarable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/Declarable.java
@@ -55,7 +55,7 @@ import java.util.Properties;
  *
  *
  * 
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskAccessException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskAccessException.java
index f174ec2..e8787da 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskAccessException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskAccessException.java
@@ -23,7 +23,7 @@ import java.io.IOException;
  *
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class DiskAccessException extends CacheRuntimeException {
   private static final long serialVersionUID = 5799100281147167888L;
@@ -52,7 +52,7 @@ public class DiskAccessException extends CacheRuntimeException {
    *
    * @param msg a message string
    * @param regionName The name of the Region for which the disk operation failed
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskAccessException(String msg, String regionName) {
     this(msg, null, regionName);
@@ -63,7 +63,7 @@ public class DiskAccessException extends CacheRuntimeException {
    *
    * @param msg a message string
    * @param ds The disk store for which the disk operation failed
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskAccessException(String msg, DiskStore ds) {
     this(msg, null, ds);
@@ -76,7 +76,7 @@ public class DiskAccessException extends CacheRuntimeException {
    * @param msg the message string
    * @param cause a causal Throwable
    * @param regionName The name of the Region for which the disk operation failed
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskAccessException(String msg, Throwable cause, String regionName) {
     super((regionName!=null ? "For Region: " + regionName + ": " : "") + msg, cause);
@@ -89,7 +89,7 @@ public class DiskAccessException extends CacheRuntimeException {
    * @param msg the message string
    * @param cause a causal Throwable
    * @param ds The disk store for which the disk operation failed
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskAccessException(String msg, Throwable cause, DiskStore ds) {
     super((ds!=null ? "For DiskStore: " + ds.getName() + ": " : "") + msg, cause);
@@ -110,7 +110,7 @@ public class DiskAccessException extends CacheRuntimeException {
    *
    * @param msg the message string
    * @param cause a causal Throwable
-   * @since gemfire 8.0
+   * @since GemFire 8.0
    */
   public DiskAccessException(String msg, Throwable cause) {
     super(msg, cause);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStore.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStore.java
index 40586b2..2ccb84c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStore.java
@@ -30,7 +30,7 @@ import java.util.UUID;
  * </PRE>
  * <p>Existing DiskStore instances can be found using {@link Cache#findDiskStore(String)}
  *
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public interface DiskStore {
@@ -176,7 +176,7 @@ public interface DiskStore {
    * @throws IllegalStateException if the disk store is currently
    * in use by any regions, gateway senders, or a PDX type registry.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public void destroy();
   
@@ -186,7 +186,7 @@ public interface DiskStore {
    * disk volume.
    * 
    * @return the warning percent
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public float getDiskUsageWarningPercentage();
 
@@ -195,7 +195,7 @@ public interface DiskStore {
    * disk volume.
    * 
    * @return the critical percent
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public float getDiskUsageCriticalPercentage();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
index 17254e4..1654b1a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
@@ -27,7 +27,7 @@ import java.io.File;
  * To use this factory configure it with the <code>set</code> methods and then
  * call {@link #create} to produce a disk store instance.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface DiskStoreFactory
 {
@@ -215,7 +215,7 @@ public interface DiskStoreFactory
    * 
    * @param warningPercent warning percent of disk usage
    * @return a reference to <code>this</code>
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public DiskStoreFactory setDiskUsageWarningPercentage(float warningPercent);
 
@@ -225,7 +225,7 @@ public interface DiskStoreFactory
    * 
    * @param criticalPercent critical percent of disk usage
    * @return a reference to <code>this</code>
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public DiskStoreFactory setDiskUsageCriticalPercentage(float criticalPercent);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributes.java
index 9e4c499..426b402 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributes.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache;
  * @see Region#writeToDisk
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  * @deprecated as of 6.5 use {@link DiskStore} instead
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributesFactory.java
index 3fae4d9..4060ffb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DiskWriteAttributesFactory.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
 /**
  * Factory for getting DiskWriteAttribute objects
  * 
- * @since 5.1
+ * @since GemFire 5.1
  * @deprecated as of 6.5 use {@link DiskStoreFactory} instead
  */
 @Deprecated
@@ -249,7 +249,7 @@ public final class DiskWriteAttributesFactory implements java.io.Serializable
    * @throws IllegalStateException
    *           if the current settings has compaction enabled with maximum Oplog
    *           Size specified as infinite ( represented by 0 ) *
-   * @since 5.1
+   * @since GemFire 5.1
    * @deprecated as of 6.5 use {@link DiskStoreFactory#create} instead
    */
   @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DuplicatePrimaryPartitionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DuplicatePrimaryPartitionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DuplicatePrimaryPartitionException.java
index 233b88a..f5ecd76 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DuplicatePrimaryPartitionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DuplicatePrimaryPartitionException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireException;
  * This exception is thrown when two nodes are defined with same primary
  * partitions
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class DuplicatePrimaryPartitionException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
index 3321e87..9a59833 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionFactory.java
@@ -125,7 +125,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * that name and uses it to keep track of what dynamic Regions exist. Applications should
  * not directly access this Region; instead use the methods on this factory.
  * </ul>
- * @since 4.3
+ * @since GemFire 4.3
  *
  */
 @SuppressWarnings("deprecation")
@@ -669,7 +669,7 @@ public abstract class DynamicRegionFactory  {
    * <li>persistBackup: <code>true</code>
    * <li>registerInterest: <code>true</code>
    * </ul>
-   * @since 4.3
+   * @since GemFire 4.3
    */
   public static class Config  {
     private static final boolean DISABLE_REGISTER_INTEREST = Boolean.getBoolean("DynamicRegionFactory.disableRegisterInterest");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionListener.java
index 18e49a3..e679cb7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/DynamicRegionListener.java
@@ -30,7 +30,7 @@ package com.gemstone.gemfire.cache;
  * <p>
  * See {@link DynamicRegionFactory}
  *
- * @since 4.3
+ * @since GemFire 4.3
  */
 public interface DynamicRegionListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryDestroyedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryDestroyedException.java
index 6164bcb..6ae0227 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryDestroyedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryDestroyedException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  *
  * 
  * @see Region.Entry
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class EntryDestroyedException extends CacheRuntimeException
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryEvent.java
index 60c53a0..84eec6e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryEvent.java
@@ -35,7 +35,7 @@ package com.gemstone.gemfire.cache;
  * @see CacheListener
  * @see CacheWriter
  * @see RegionEvent
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface EntryEvent<K,V> extends CacheEvent<K,V> {
 
@@ -67,7 +67,7 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
    * @return the serialized form of the value in the cache before this event
    * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public SerializedCacheValue<V> getSerializedOldValue();
 
@@ -85,7 +85,7 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
    * @return the serialized form of the value in the cache after this event
    * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public SerializedCacheValue<V> getSerializedNewValue();
 
@@ -134,14 +134,14 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
    * Gets the TransactionId for this EntryEvent.
    * @return the ID of the transaction that performed the operation that
    * generated this event; null if no transaction involved.
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public TransactionId getTransactionId();
   
   /**
    * Returns true if this event originated on a client.
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    * @return true if this event originated on a client.
    * @deprecated as of 5.7 use {@link #hasClientOrigin} instead.
    */
@@ -150,7 +150,7 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
   /**
    * Returns true if this event originated on a client.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    * @return true if this event originated on a client.
    */
   public boolean hasClientOrigin();
@@ -160,7 +160,7 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
    * or it was deemed too expensive to obtain.
    * Note that {@link #getOldValue} will return <code>null</code> when this
    * method returns <code>false</code>.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isOldValueAvailable();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryExistsException.java
index 574d9b2..14e4146 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryExistsException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache;
  *
  * @see com.gemstone.gemfire.cache.Region#create(Object, Object)
  * @see Region.Entry
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class EntryExistsException extends CacheException {
 
@@ -33,7 +33,7 @@ public class EntryExistsException extends CacheException {
   /**
    * Constructs an instance of <code>EntryExistsException</code> with the specified detail message.
    * @param msg the detail message
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public EntryExistsException(String msg, Object oldValue) {
     super(msg);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryNotFoundException.java
index 2a6a336..8415f49 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryNotFoundException.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache;
  * @see com.gemstone.gemfire.cache.Region#invalidate(Object)
  * @see com.gemstone.gemfire.cache.Region#destroy(Object)
  * @see Region.Entry
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class EntryNotFoundException extends CacheException {
 private static final long serialVersionUID = -2404101631744605659L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryOperation.java
index 6e8bb4c..2e44ef8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EntryOperation.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache;
  * 
  * 
  * @see PartitionResolver  
- * @since 6.0 
+ * @since GemFire 6.0
  */
 public interface EntryOperation<K,V> {
 
@@ -40,7 +40,7 @@ public interface EntryOperation<K,V> {
    * It may return null and should not be used to generate routing object
    * in {@link PartitionResolver#getRoutingObject(EntryOperation)}
    * @return the operation that triggered this event.
-   * @since 6.0
+   * @since GemFire 6.0
    * @deprecated
    */
   public Operation getOperation();
@@ -69,7 +69,7 @@ public interface EntryOperation<K,V> {
    * not be obtained.
    * Note that {@link #getCallbackArgument} will return <code>null</code>
    * when this method returns <code>false</code>.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isCallbackArgumentAvailable();