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:10:46 UTC

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

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 03246b404 -> 8eac0fa8c


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberHeapUsageService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberHeapUsageService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberHeapUsageService.java
index 5740c60..3a64161 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberHeapUsageService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberHeapUsageService.java
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Memeber's current Heap Usage
  * and its trend over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberHeapUsage")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberKeyStatisticsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberKeyStatisticsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberKeyStatisticsService.java
index c4c7917..de69ca0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberKeyStatisticsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberKeyStatisticsService.java
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Member's CPU, Memory and Read
  * Write details
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberKeyStatistics")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberRegionsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberRegionsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberRegionsService.java
index 2add485..a1000df 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberRegionsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberRegionsService.java
@@ -40,7 +40,7 @@ import java.text.DecimalFormat;
  * 
  * This class contains implementations of getting Memeber's Regions details.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MembersListService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MembersListService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MembersListService.java
index 607062f..c89f3d0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MembersListService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MembersListService.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
  * 
  * This class contains implementations of getting list of Cluster Members.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MembersList")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseService.java
index 0976cf5..9fbfa1b 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseService.java
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
  * 
  * This is a base class for all services in pulse.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 public interface PulseService {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseServiceFactory.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseServiceFactory.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseServiceFactory.java
index 88b8158..48a1cc0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseServiceFactory.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseServiceFactory.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
 /**
  * Class PulseServiceFactory
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Scope("singleton")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseVersionService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseVersionService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseVersionService.java
index fd32a7f..a04b9bb 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseVersionService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/PulseVersionService.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
  * details (like version details, build details, source details, etc) from
  * properties file
  * 
- * @since version 7.0.Beta
+ * @since GemFire version 7.0.Beta
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/QueryStatisticsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/QueryStatisticsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/QueryStatisticsService.java
index 12c0065..699e9be 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/QueryStatisticsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/QueryStatisticsService.java
@@ -38,7 +38,7 @@ import com.vmware.gemfire.tools.pulse.internal.data.Repository;
  * This class returns top N queries based on pagination and filtering criteria
  * if any
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("QueryStatistics")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/SystemAlertsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/SystemAlertsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/SystemAlertsService.java
index a0c4b47..d1c61c4 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/SystemAlertsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/SystemAlertsService.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting system's alerts details (like
  * errors, warnings and severe errors).
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/IPAddressUtil.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/IPAddressUtil.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/IPAddressUtil.java
index b00730a..1158251 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/IPAddressUtil.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/IPAddressUtil.java
@@ -32,7 +32,7 @@ import java.util.regex.PatternSyntaxException;
  * versions i.e. IPv4 or IPv6 address
  * 
  * 
- * @since version 7.0.1
+ * @since GemFire version 7.0.1
  */
 public class IPAddressUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/StringUtils.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/StringUtils.java
index 7678846..56cbf1b 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/StringUtils.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/StringUtils.java
@@ -23,7 +23,7 @@ package com.vmware.gemfire.tools.pulse.internal.util;
  * Class StringUtils This is utility class for string.
  * 
  * 
- * @since version 7.0.1
+ * @since GemFire version 7.0.1
  */
 public class StringUtils {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/TimeUtils.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/TimeUtils.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/TimeUtils.java
index 508d8ff..73ce389 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/TimeUtils.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/util/TimeUtils.java
@@ -25,7 +25,7 @@ package com.vmware.gemfire.tools.pulse.internal.util;
  * This is utility class used for conversions of time.
  * 
  * 
- * @since version 7.0.1
+ * @since GemFire version 7.0.1
  */
 public class TimeUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
index f8055b1..ce64c42 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/regionView.js
@@ -20,7 +20,7 @@
 /* Region Details javascript with pop-up with spark-lines opening from each tree-map cell showing member level region information.
  * This page opens from Data view on cluster page and links to member details page by clicking on tree map cell.
  *
- * @since version 7.5 Cedar 2014-03-01
+ * @since GemFire version 7.5 Cedar 2014-03-01
  *
  */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
index a587b5a..9d201fb 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
@@ -24,7 +24,7 @@
 * 
 *
 * @version 1.0
-* @since   2014-04-02
+* @since GemFire   2014-04-02
 */
 
 package com.vmware.gemfire.tools.pulse.tests;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
index d3ddfda..8647d12 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 
 /**
  * Used to send operations from a sender to a receiver.
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class SenderProxy extends ServerProxy{
   public SenderProxy(InternalPool pool) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
index 168dc63..e25b6c9 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipL
  * with local locators(within the site) as well as remote locators (across the
  * site)
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LocatorDiscovery{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
index 0893653..c058333 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
  * Requests remote locators of a remote WAN site
  * 
  * 
- * @since 6.6
+ * @since GemFire 6.6
  * 
  */
 public class RemoteLocatorJoinRequest implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
index bd9476b..c5c2a2f 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
index 3239506..3779749 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GatewayReceiverImpl implements GatewayReceiver {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 83c75f1..b178192 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
 import com.gemstone.gemfire.cache.client.internal.SenderProxy;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class GatewaySenderEventRemoteDispatcher implements

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
index e7ba187..3e3244e 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class GatewaySenderFactoryImpl implements

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index fa21b18..b313403 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index 92f1645..85e1bc0 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 0e7e8d8..2040e5f 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
- * @since 7.0.1
+ * @since GemFire 7.0.1
  */
 public class UpdateVersionDUnitTest extends DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index d16d168..53c54ab 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -264,7 +264,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
    * {@link XmlGenerator}, {@link XmlEntity} as it applies to Extensions.
    * Asserts that Mock Extension is created and altered on region and cache.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testCreateExtensions() throws Exception {
@@ -335,7 +335,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
    * {@link XmlGenerator}, {@link XmlEntity} as it applies to Extensions.
    * Asserts that Mock Entension is created and destroyed on region and cache.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testDestroyExtensions() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/AbstractBaseController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/AbstractBaseController.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/AbstractBaseController.java
index b461fcc..88668f9 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/AbstractBaseController.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/AbstractBaseController.java
@@ -89,7 +89,7 @@ import org.json.JSONTokener;
 
 /**
  * AbstractBaseController class contains common functionalities required for other controllers. 
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/BaseControllerAdvice.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/BaseControllerAdvice.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/BaseControllerAdvice.java
index 32f0f7d..125c581 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/BaseControllerAdvice.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/BaseControllerAdvice.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.rest.internal.web.exception.ResourceNotFoundExceptio
 /**
  * The CrudControllerAdvice class handles exception thrown while serving the REST request
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @ControllerAdvice

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/CommonCrudController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/CommonCrudController.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/CommonCrudController.java
index 0a4b0d2..166d0cf 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/CommonCrudController.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/CommonCrudController.java
@@ -51,7 +51,7 @@ import com.wordnik.swagger.annotations.ApiResponses;
  * The CommonCrudController serves REST Requests related to listing regions, 
  * listing keys in region, delete keys or delete all data in region.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/FunctionAccessController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/FunctionAccessController.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/FunctionAccessController.java
index f807576..157e3f3 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/FunctionAccessController.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/FunctionAccessController.java
@@ -42,7 +42,7 @@ import java.util.*;
 /**
  * The FunctionsController class serving REST Requests related to the function execution
  * @see org.springframework.stereotype.Controller
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @Controller("functionController")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/PdxBasedCrudController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/PdxBasedCrudController.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/PdxBasedCrudController.java
index 0fe62ae..2f646dc 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/PdxBasedCrudController.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/PdxBasedCrudController.java
@@ -48,7 +48,7 @@ import com.wordnik.swagger.annotations.ApiResponses;
  * The PdxBasedCrudController class serving REST Requests related to the REST CRUD operation on region
  * <p/>
  * @see org.springframework.stereotype.Controller
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @Controller("pdxCrudController")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/QueryAccessController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/QueryAccessController.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/QueryAccessController.java
index d773ef9..9759d2c 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/QueryAccessController.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/QueryAccessController.java
@@ -57,7 +57,7 @@ import com.wordnik.swagger.annotations.ApiResponses;
  * The QueryingController class serves all HTTP REST requests related to the gemfire querying
  * <p/>
  * @see org.springframework.stereotype.Controller
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @Controller("queryController")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/QueryResultTypes.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/QueryResultTypes.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/QueryResultTypes.java
index 067ca34..6f7d841 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/QueryResultTypes.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/QueryResultTypes.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.rest.internal.web.controllers.support;
 /**
  * The QueryResultTypes type describes possible query result types 
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public enum QueryResultTypes {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionData.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionData.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionData.java
index 72596fb..60b92ff 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionData.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionData.java
@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
  * <p/>
  * @see com.fasterxml.jackson.databind.JsonSerializable
  * @see java.lang.Iterable
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionEntryData.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionEntryData.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionEntryData.java
index 444e91f..9c3d8bf 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionEntryData.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/controllers/support/RegionEntryData.java
@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
  * <p/>
  * @see com.fasterxml.jackson.databind.JsonSerializable
  * @see java.lang.Iterable
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/DataTypeNotSupportedException.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/DataTypeNotSupportedException.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/DataTypeNotSupportedException.java
index 5b5f9a9..baeabe4 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/DataTypeNotSupportedException.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/DataTypeNotSupportedException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Indicates that error encountered while converting Non-Pdx type values/data into RESTful format, i.e JSON
  * <p/>
- * @since 8.1
+ * @since GemFire 8.1
  */
 
 public class DataTypeNotSupportedException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/GemfireRestException.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/GemfireRestException.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/GemfireRestException.java
index 2df7c09..b7df3d7 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/GemfireRestException.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/GemfireRestException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Indicates that error encountered while processing REST request.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class GemfireRestException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/MalformedJsonException.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/MalformedJsonException.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/MalformedJsonException.java
index 13c4444..d235c95 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/MalformedJsonException.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/MalformedJsonException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.pdx.JSONFormatterException;
 /**
  * Indicates that incorrect JSON document encountered while processing it.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/RegionNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/RegionNotFoundException.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/RegionNotFoundException.java
index 8eaa9e5..aaf3dfb 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/RegionNotFoundException.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/RegionNotFoundException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.rest.internal.web.exception;
 /**
  * Indicates that Region does not found while trying to do some REST operation on that region.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class RegionNotFoundException extends ResourceNotFoundException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/ResourceNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/ResourceNotFoundException.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/ResourceNotFoundException.java
index cabcca1..0cb3065 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/ResourceNotFoundException.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/exception/ResourceNotFoundException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.rest.internal.web.exception;
 /**
  * Indicates that resource (key, value etc) does not found while trying to do REST operation.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class ResourceNotFoundException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
index 384f3c7..c2c5e9f 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/http/converter/CustomMappingJackson2HttpMessageConverter.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * The CustomMappingJackson2HttpMessageConverter class...
  * 
  * @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
- * @since 0.0.1
+ * @since GemFire 0.0.1
  */
 @SuppressWarnings("unused")
 public class CustomMappingJackson2HttpMessageConverter extends

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ArrayUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ArrayUtils.java
index 539efe0..b4b9251 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ArrayUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ArrayUtils.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * The ArrayUtils class is an abstract utility class for working with Object arrays.
  * <p/>
  * @see java.util.Arrays
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class ArrayUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/DateTimeUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/DateTimeUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/DateTimeUtils.java
index 87b2908..a92ff29 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/DateTimeUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/DateTimeUtils.java
@@ -27,7 +27,7 @@ import java.util.Date;
  * @see java.util.Calendar
  * @see java.text.DateFormat
  * @see java.util.Date
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class DateTimeUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/IdentifiableUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/IdentifiableUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/IdentifiableUtils.java
index 83ab606..1fe3e08 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/IdentifiableUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/IdentifiableUtils.java
@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
  * identifiers
  * <p/>
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class IdentifiableUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JSONUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JSONUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JSONUtils.java
index 2943493..cb9b39d 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JSONUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JSONUtils.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
 /**
  * The JSONUtils class is a utility class for getting JSON equivalent from Java types.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class JSONUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JsonWriter.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JsonWriter.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JsonWriter.java
index 2131099..a0ff676 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JsonWriter.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/JsonWriter.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.rest.internal.web.exception.GemfireRestException;
 /**
  * The JsonWriter class is an utility to write various java types as a JSON string.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class JsonWriter {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/NumberUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/NumberUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/NumberUtils.java
index 242b9c3..ac63e94 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/NumberUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/NumberUtils.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.lang.ClassUtils;
  * <p/>
  * 
  * @see java.lang.Number
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class NumberUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ValidationUtils.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ValidationUtils.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ValidationUtils.java
index bbddaa3..e0e1966 100644
--- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ValidationUtils.java
+++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/util/ValidationUtils.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.rest.internal.web.util;
 /**
  * The ValidationUtils class is a utility class for performing validations.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
index a8f209b..3f7e19b 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 /**
- * @since  8.1
+ * @since GemFire  8.1
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/AbstractWebTestCase.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/AbstractWebTestCase.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/AbstractWebTestCase.java
index 715bb49..ae5c749 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/AbstractWebTestCase.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/AbstractWebTestCase.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.web.domain.Link;
  * @see java.net.URLDecoder
  * @see java.net.URLEncoder
  * @see com.gemstone.gemfire.management.internal.web.domain.Link
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class AbstractWebTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
index 7234161..8fd3127 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * <p/>
  * @see org.junit.Test
  * @see com.gemstone.gemfire.management.internal.web.controllers.ShellCommandsController
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class ShellCommandsControllerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
index f9d9d35..0037a48 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptorJUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class LoginHandlerInterceptorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndexJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndexJUnitTest.java
index fc6e215..61a9736 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndexJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndexJUnitTest.java
@@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category;
  * @see com.gemstone.gemfire.management.internal.web.domain.LinkIndex
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class LinkIndexJUnitTest extends AbstractWebTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkJUnitTest.java
index 9ed93aa..c0b1620 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/LinkJUnitTest.java
@@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category;
  * @see com.gemstone.gemfire.management.internal.web.domain.Link
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class LinkJUnitTest extends AbstractWebTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSourceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSourceJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSourceJUnitTest.java
index 0a23163..ae2f87b 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSourceJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSourceJUnitTest.java
@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
  * @see com.gemstone.gemfire.management.internal.web.domain.QueryParameterSource
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class QueryParameterSourceJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
index 0e2cd0c..bbe961b 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequestJUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class ClientHttpRequestJUnitTest extends AbstractWebTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
index 1b317c2..9ecf645 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverterJUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class SerializableObjectHttpMessageConverterJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
index bcc3cef..b11125c 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.management.internal.web.shell.RestHttpOperationInvoker
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 @Category(UnitTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
index 74ed09e..557cc20 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvokerJUnitTest.java
@@ -46,7 +46,7 @@ import org.springframework.web.client.ResourceAccessException;
  * @see org.junit.After
  * @see org.junit.Before
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class SimpleHttpOperationInvokerJUnitTest extends AbstractWebTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
index 180641c..d9eb8e5 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtilsJUnitTest.java
@@ -40,7 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @see com.gemstone.gemfire.management.internal.web.util.ConvertUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class ConvertUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/UriUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/UriUtilsJUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/UriUtilsJUnitTest.java
index 032da85..645133a 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/UriUtilsJUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/web/util/UriUtilsJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
  * @see com.gemstone.gemfire.management.internal.web.util.UriUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class UriUtilsJUnitTest extends AbstractWebTestCase {


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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientSubscriptionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientSubscriptionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientSubscriptionConfigImpl.java
index a44677a..a4a8882 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientSubscriptionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientSubscriptionConfigImpl.java
@@ -58,7 +58,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
    * will be in MB for eviction-policy mem else
    * number of entries
    * @see #DEFAULT_CAPACITY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getCapacity(){
     return this.haQueueCapacity ;
@@ -68,7 +68,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
    * will be in MB for eviction-policy mem else
    * number of entries
    * @see #DEFAULT_CAPACITY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setCapacity(int capacity){
     this.haQueueCapacity = capacity;
@@ -76,7 +76,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   /**
    * Returns the eviction policy that is executed when capacity of the client client queue is reached.
    * @see #DEFAULT_EVICTION_POLICY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getEvictionPolicy(){
     return this.haEvictionPolicy ;
@@ -84,7 +84,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   /**
    * Sets the eviction policy that is executed when capacity of the client client queue is reached.
    * @see #DEFAULT_EVICTION_POLICY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setEvictionPolicy(String policy){
     this.haEvictionPolicy = policy;
@@ -93,7 +93,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   /**
    * Sets the overflow directory for a client client queue 
    * @param overflowDirectory the overflow directory for a client queue's overflowed entries
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of prPersistSprint2 
    */
   @Deprecated
@@ -111,7 +111,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
    * overflowed client queue entries.
    * @return the overflow directory for a client queue's
    * overflowed entries
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of prPersistSprint2 
    */
   @Deprecated
@@ -137,7 +137,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   }
   /**
    * get the diskStoreName for overflow
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public String getDiskStoreName() {
     return diskStoreName;
@@ -145,7 +145,7 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   /**
    * Sets the disk store name for overflow  
    * @param diskStoreName 
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public void setDiskStoreName(String diskStoreName) {
     if (hasOverflowDirectory()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
index 72edc10..7e97f4d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ColocationHelper.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * various scenarios
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class ColocationHelper {
 
@@ -63,7 +63,7 @@ public class ColocationHelper {
     *
     * @param partitionedRegion
     * @return colocated PartitionedRegion
-    * @since cheetah
+    * @since GemFire cheetah
     */
   public static PartitionedRegion getColocatedRegionName(
       final PartitionedRegion partitionedRegion) {
@@ -124,7 +124,7 @@ public class ColocationHelper {
    * 
    * @param partitionedRegion
    * @return colocated PartitionedRegion
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public static PartitionedRegion getColocatedRegion(
       final PartitionedRegion partitionedRegion) {
@@ -339,7 +339,7 @@ public class ColocationHelper {
    * @param partitionedRegion
    * @return List of all partitioned regions (excluding self) in a colocated
    *         chain
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public static Map<String, PartitionedRegion> getAllColocationRegions(
       PartitionedRegion partitionedRegion) {
@@ -375,7 +375,7 @@ public class ColocationHelper {
    * 
    * @param partitionedRegion
    * @return map of region name to local colocated regions
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public static Map<String, Region> getAllColocatedLocalDataSets(
       PartitionedRegion partitionedRegion, InternalRegionFunctionContext context) {
@@ -432,7 +432,7 @@ public class ColocationHelper {
    * 
    * @param partitionedRegion
    * @return list of all child partitioned regions colocated with the region
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public static List<PartitionedRegion> getColocatedChildRegions(
       PartitionedRegion partitionedRegion) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CommitReplyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CommitReplyException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CommitReplyException.java
index 8cf9665..bf3e341 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CommitReplyException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CommitReplyException.java
@@ -22,7 +22,7 @@ import java.util.*;
 /**
  * Contains exceptions generated when attempting to process a commit operation.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class CommitReplyException extends ReplyException {
 private static final long serialVersionUID = -7711083075296622596L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CompactableOplog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CompactableOplog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CompactableOplog.java
index 697214d..8691ec9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CompactableOplog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CompactableOplog.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.persistence.DiskRegionView;
  * they can be compacted.
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public interface CompactableOplog {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Conflatable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Conflatable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Conflatable.java
index 7178bc7..cb5cb0d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Conflatable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Conflatable.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
  * client.
  * 
  * 
- * @since 4.2
+ * @since GemFire 4.2
  */
 public interface Conflatable extends Serializable
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java
index ccc14eb..fb826f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ControllerAdvisor.java
@@ -112,7 +112,7 @@ public class ControllerAdvisor extends GridAdvisor {
      * controller. The reply needs to contain any controller(s) that exist in
      * this vm and any bridge servers that exist in this vm.
      * 
-     * @since 5.7
+     * @since GemFire 5.7
      */
     @Override
     public void processIncoming(DistributionManager dm, String adviseePath,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CountingDataInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CountingDataInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CountingDataInputStream.java
index 36fc752..ce0273d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CountingDataInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CountingDataInputStream.java
@@ -22,7 +22,7 @@ import java.io.*;
  * A data input stream that counts the bytes it plans on reading.
  * 
  * 
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 
 public class CountingDataInputStream implements DataInput {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CustomEntryExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CustomEntryExpiryTask.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CustomEntryExpiryTask.java
index d7382bd..2c380f2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CustomEntryExpiryTask.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CustomEntryExpiryTask.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.ExpirationAttributes;
  * Remembers the expiration attributes returned from
  * the customer's CustomExpiry callback, if any.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  *
  */
 public class CustomEntryExpiryTask extends EntryExpiryTask {  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyPartitionedRegionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyPartitionedRegionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyPartitionedRegionMessage.java
index 9715992..4539526 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyPartitionedRegionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DestroyPartitionedRegionMessage.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * A standard {@link ReplyMessage} is used to send the reply, however any exception that it carries
  * is ignored, preventing interuption after sending this message.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class DestroyPartitionedRegionMessage extends PartitionMessage
 {
@@ -225,7 +225,7 @@ public final class DestroyPartitionedRegionMessage extends PartitionMessage
   /**
    * The response on which to wait for all the replies.  This response ignores any exceptions received from the "far side"
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static public class DestroyPartitionedRegionResponse extends ReplyProcessor21
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DirectoryHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DirectoryHolder.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DirectoryHolder.java
index dfdf984..d3ad07e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DirectoryHolder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DirectoryHolder.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.StatisticsFactory;
  * A holder for a disk Directory. Used for maintaining the available space and
  * updating disk statistics
  * 
- * @since 5.1
+ * @since GemFire 5.1
  * 
  */
 public class DirectoryHolder

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskDirectoryStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskDirectoryStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskDirectoryStats.java
index 5aeec38..21a7b26 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskDirectoryStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskDirectoryStats.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.*;
  * GemFire statistics about Disk Directories
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class DiskDirectoryStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
index 54ecb04..e015460 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskEntry.java
@@ -69,7 +69,7 @@ import com.gemstone.gemfire.internal.util.BlobHelper;
  * @see DiskRegion
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public interface DiskEntry extends RegionEntry {
   /**
@@ -138,7 +138,7 @@ public interface DiskEntry extends RegionEntry {
      * Testing purpose only
      * Get the value of an entry that is on disk without faulting
      * it in and without looking in the io buffer.
-     * @since 3.2.1
+     * @since GemFire 3.2.1
      */
     static Object getValueOnDisk(DiskEntry entry, DiskRegion dr) {
       DiskId id = entry.getDiskId();
@@ -168,7 +168,7 @@ public interface DiskEntry extends RegionEntry {
      * @param entry the entry used to identify the value to fetch
      * @param dr the persistent storage from which to fetch the value
      * @return either null, byte array, or CacheDeserializable
-     * @since gemfire57_hotfix
+     * @since GemFire 57_hotfix
      */
     public static Object getSerializedValueOnDisk(
         DiskEntry entry, DiskRegion dr) {
@@ -199,7 +199,7 @@ public interface DiskEntry extends RegionEntry {
      * This method is used for concurrent map operations and CQ processing
      * 
      * @throws DiskAccessException
-     * @since 5.1
+     * @since GemFire 5.1
      */
     static Object getValueOnDiskOrBuffer(DiskEntry entry, DiskRegion dr, RegionEntryContext context) {
       @Released Object v = getOffHeapValueOnDiskOrBuffer(entry, dr, context);
@@ -252,7 +252,7 @@ public interface DiskEntry extends RegionEntry {
      * Returns false if the entry is INVALID (or LOCAL_INVALID). Determines this
      * without faulting in the value from disk.
      * 
-     * @since 3.2.1
+     * @since GemFire 3.2.1
      */
     /* TODO prpersist - Do we need this method? It was added by the sqlf merge
     static boolean isValid(DiskEntry entry, DiskRegion dr) {
@@ -309,7 +309,7 @@ public interface DiskEntry extends RegionEntry {
     /**
      * Get the value of an entry that is on disk without faulting
      * it in.
-     * @since 3.2.1
+     * @since GemFire 3.2.1
      */
     static boolean fillInValue(DiskEntry de, InitialImageOperation.Entry entry,
                                DiskRegion dr, DM mgr, ByteArrayDataInput in, RegionEntryContext context) {
@@ -1700,7 +1700,7 @@ public interface DiskEntry extends RegionEntry {
     /**
      * Flush an entry that was previously scheduled to be written to disk.
      * @param tag 
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     public static void doAsyncFlush(DiskEntry entry, LocalRegion region, VersionTag tag) {
       if (region.isThisRegionBeingClosedOrDestroyed()) return;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskId.java
index dd916af..3da3879 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskId.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * <li>Userbits of the value
  * </ul>
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public abstract class DiskId
@@ -184,13 +184,13 @@ public abstract class DiskId
   /**
    * Return true if entry is schedule to be async written to disk.
    * Return false if it has already been written or was never modified.
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public boolean isPendingAsync() {
     return EntryBits.isPendingAsync(getUserBits());
   }
   /**
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public synchronized void setPendingAsync(boolean v) {
     byte origBits = getUserBits();
@@ -460,12 +460,12 @@ public abstract class DiskId
   {
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry prev;
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry next;
 
@@ -528,12 +528,12 @@ public abstract class DiskId
   {
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry prev;
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry next;
 
@@ -611,12 +611,12 @@ public abstract class DiskId
   {
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry prev;
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry next;
 
@@ -695,12 +695,12 @@ public abstract class DiskId
   {
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry prev;
     /**
      * Used by DiskRegion for compaction
-     * @since prPersistSprint1
+     * @since GemFire prPersistSprint1
      */
     private DiskEntry next;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
index 7e2333e..018a065 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskInitFile.java
@@ -87,7 +87,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * Does all the IF file work for a DiskStoreImpl.
  *
  *
- * @since prPersistSprint1
+ * @since GemFire prPersistSprint1
  */
 public class DiskInitFile implements DiskInitFileInterpreter {
   private static final Logger logger = LogService.getLogger();
@@ -135,7 +135,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: blobLength
    *   blobLength: member bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_ONLINE_MEMBER_ID = 59;
   /**
@@ -146,7 +146,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: blobLength
    *   blobLength: member bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_OFFLINE_MEMBER_ID = 60;
   /**
@@ -157,7 +157,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: blobLength
    *   blobLength: member bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_RM_MEMBER_ID = 61;
   /**
@@ -168,7 +168,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: blobLength
    *   blobLength: member bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_MY_MEMBER_INITIALIZING_ID = 62;
   /**
@@ -177,7 +177,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    *   RegionId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_MY_MEMBER_INITIALIZED_ID = 63;
 
@@ -189,7 +189,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: nameLength
    *   nameLength: name bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_CREATE_REGION_ID = 64;
   /**
@@ -198,7 +198,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    *   RegionId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_BEGIN_DESTROY_REGION_ID = 65;
   /**
@@ -208,7 +208,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   RegionId
    *   8: oplogEntryId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_CLEAR_REGION_ID = 66;
   /**
@@ -217,7 +217,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    *   RegionId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_END_DESTROY_REGION_ID = 67;
   /**
@@ -226,7 +226,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    *   RegionId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_BEGIN_PARTIAL_DESTROY_REGION_ID = 68;
   /**
@@ -235,7 +235,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    *   RegionId
    *   1: EndOfRecordMarker
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public static final byte IFREC_END_PARTIAL_DESTROY_REGION_ID = 69;
 
@@ -291,7 +291,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   4: blobLength
    *   blobLength: member bytes
    *   1: EndOfRecordMarker
-   * @since prPersistSprint3
+   * @since GemFire prPersistSprint3
    */
   public static final byte IFREC_OFFLINE_AND_EQUAL_MEMBER_ID = 75;
   /**
@@ -363,7 +363,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Used to say that a disk store has been revoked
    * Byte Format:
    *   variable: a PersistentMemberPattern
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static final byte IFREC_REVOKE_DISK_STORE_ID = 81;
   
@@ -372,7 +372,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Byte Format:
    * 1: version byte from Version.GFE_CURRENT.ordinal
    * 1: EndOfRecord
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static final byte IFREC_GEMFIRE_VERSION = 82;
 
@@ -383,7 +383,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    *   RegionId
    *   variable: serialized RVV
    *   1: EndOfRecordMarker
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static final byte IFREC_CLEAR_REGION_WITH_RVV_ID = 83;
   
@@ -414,7 +414,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * number
    * Followed by EndOfRecord
    * Fix for bug 43824
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public static final byte OPLOG_MAGIC_SEQ_ID = 89;
   
@@ -435,7 +435,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * 1: versioned (boolean)
    * 1: offHeap (boolean) added in 9.0
    * 1: EndOfRecordMarker
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final byte IFREC_REGION_CONFIG_ID_90 = 90;
 
@@ -2438,7 +2438,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
    * Currently only few for GemFireXD added here but all other boolean flags also
    * be better moved here.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public enum DiskRegionFlag {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
index c1d2f03..a2092fd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegion.java
@@ -42,7 +42,7 @@ import joptsimple.internal.Strings;
  * Used for both persistent recoverable regions and overflow-only regions.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class DiskRegion extends AbstractDiskRegion {
 
@@ -404,7 +404,7 @@ public class DiskRegion extends AbstractDiskRegion {
   }
 
   /**
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   final BytesAndBits getBytesAndBits(DiskId id) {
     return getBytesAndBits(id, true);
@@ -415,7 +415,7 @@ public class DiskRegion extends AbstractDiskRegion {
   }
 
   /**
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   final byte getBits(DiskId id) {
     return getDiskStore().getBits(this, id);
@@ -470,20 +470,20 @@ public class DiskRegion extends AbstractDiskRegion {
   /**
    * Get serialized form of data off the disk
    * @param id
-   * @since gemfire5.7_hotfix
+   * @since GemFire 5.7
    */
   public Object getSerializedData(DiskId id) {
     return getDiskStore().getSerializedData(this, id);
   }
 
   /**
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public void scheduleAsyncWrite(AsyncDiskEntry ade) {
     getDiskStore().scheduleAsyncWrite(ade);
   }
   /**
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public void unscheduleAsyncWrite(DiskId did) {
     getDiskStore().unscheduleAsyncWrite(did);
@@ -544,7 +544,7 @@ public class DiskRegion extends AbstractDiskRegion {
   /**
    * Returns true if the state of the specified entry was recovered from disk.
    * If so it will also set it to no longer be recovered.
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public boolean testIsRecoveredAndClear(RegionEntry re) {
     DiskEntry de = (DiskEntry)re;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegionStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegionStats.java
index 75cdf21..ae9b0a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegionStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskRegionStats.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
  * GemFire statistics about a {@link DiskRegion}.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class DiskRegionStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreAttributes.java
index a391a0c..451a907 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreAttributes.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.DiskStoreFactory;
 /**
  * Creates an attribute object for DiskStore.
  * </p>
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 public class DiskStoreAttributes implements Serializable, DiskStore {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryImpl.java
index 3e3add8..1c57db9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryImpl.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
 /**
  * Implementation of DiskStoreFactory 
  * 
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 public class DiskStoreFactoryImpl implements DiskStoreFactory
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index e9cf6bf..3219bb4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -122,7 +122,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * persistent recoverable regions and overflow-only regions.
  * 
  * 
- * @since 3.2
+ * @since GemFire 3.2
  */
 @SuppressWarnings("synthetic-access")
 public class DiskStoreImpl implements DiskStore {
@@ -992,7 +992,7 @@ public class DiskStoreImpl implements DiskStore {
   }
 
   /**
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   final byte getBits(DiskRegion dr, DiskId id) {
     acquireReadLock(dr);
@@ -1151,7 +1151,7 @@ public class DiskStoreImpl implements DiskStore {
    * Note that this is no longer implemented by getting a write lock but instead
    * locks the same lock that acquireReadLock does.
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   private void acquireWriteLock(DiskRegion dr) {
     // @todo darrel: this is no longer a write lock need to change method name
@@ -1163,7 +1163,7 @@ public class DiskStoreImpl implements DiskStore {
    * This function is having a default visiblity as it is used in the
    * OplogJUnitTest for a bug verification of Bug # 35012
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
 
   private void releaseWriteLock(DiskRegion dr) {
@@ -1176,7 +1176,7 @@ public class DiskStoreImpl implements DiskStore {
    * finally block. Note that this is no longer implemented by getting a read
    * lock but instead locks the same lock that acquireWriteLock does.
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   void acquireReadLock(DiskRegion dr) {
     dr.basicAcquireReadLock();
@@ -1191,7 +1191,7 @@ public class DiskStoreImpl implements DiskStore {
   }
 
   /**
-   * @since 5.1
+   * @since GemFire 5.1
    */
 
   void releaseReadLock(DiskRegion dr) {
@@ -1212,7 +1212,7 @@ public class DiskStoreImpl implements DiskStore {
   }
 
   /**
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void forceRolling(DiskRegion dr) {
     if (!dr.isBackup())
@@ -1248,7 +1248,7 @@ public class DiskStoreImpl implements DiskStore {
    * Get serialized form of data off the disk
    * 
    * @param id
-   * @since gemfire5.7_hotfix
+   * @since GemFire 5.7
    */
   public Object getSerializedData(DiskRegion dr, DiskId id) {
     return convertBytesAndBitsToSerializedForm(getBytesAndBits(dr, id, true));
@@ -1367,7 +1367,7 @@ public class DiskStoreImpl implements DiskStore {
   }
 
   /**
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public void scheduleAsyncWrite(AsyncDiskEntry ade) {
     DiskRegion dr = ade.region.getDiskRegion();
@@ -1388,7 +1388,7 @@ public class DiskStoreImpl implements DiskStore {
   }
 
   /**
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public void unscheduleAsyncWrite(DiskId did) {
     if (did != null) {
@@ -2869,7 +2869,7 @@ public class DiskStoreImpl implements DiskStore {
   /**
    * Compacts oplogs
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    * 
    */
   class OplogCompactor implements Runnable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreStats.java
index 2f7ec72..db505b9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreStats.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionStats;
  * GemFire statistics about a {@link DiskStoreImpl}.
  *
  *
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 public class DiskStoreStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
index 914c878..3ff0333 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskWriteAttributesImpl.java
@@ -37,7 +37,7 @@ import java.util.Properties;
  * @see Region#writeToDisk
  * 
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 @SuppressWarnings({"deprecation", "unused"})
 public final class DiskWriteAttributesImpl implements DiskWriteAttributes
@@ -100,7 +100,7 @@ public final class DiskWriteAttributesImpl implements DiskWriteAttributes
   /**
    * Default disk directory size in megabytes
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static final int DEFAULT_DISK_DIR_SIZE = DiskStoreFactory.DEFAULT_DISK_DIR_SIZE;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
index 6a7b4f2..6b1073b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
@@ -96,21 +96,21 @@ public abstract class DistributedCacheOperation {
    * Deserialization policy: do not deserialize (for byte array, null or cases
    * where the value should stay serialized)
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DESERIALIZATION_POLICY_NONE = (byte)0;
 
   /**
    * Deserialization policy: deserialize eagerly (for Deltas)
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DESERIALIZATION_POLICY_EAGER = (byte)1;
 
   /**
    * Deserialization policy: deserialize lazily (for all other objects)
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DESERIALIZATION_POLICY_LAZY = (byte)2;
   
@@ -199,7 +199,7 @@ public abstract class DistributedCacheOperation {
    * false if not. Currently the only case it doesn't need to be is a
    * DestroyRegionOperation doing a "local" destroy.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   boolean isOperationReliable() {
     Operation op = this.event.getOperation();
@@ -957,7 +957,7 @@ public abstract class DistributedCacheOperation {
      * Add the cache event's old value to this message.  We must propagate
      * the old value when the receiver is doing GII and has listeners (CQs)
      * that require the old value.
-     * @since 5.5
+     * @since GemFire 5.5
      * @param event the entry event that contains the old value
      */
     public void appendOldValueToMessage(EntryEventImpl event) {
@@ -979,7 +979,7 @@ public abstract class DistributedCacheOperation {
      * Insert this message's oldValue into the given event.  This fixes
      * bug 38382 by propagating old values with Entry level
      * CacheOperationMessages during initial image transfer
-     * @since 5.5
+     * @since GemFire 5.5
      */
     public void setOldValueInEvent(EntryEventImpl event) {
       CqService cqService = event.getRegion().getCache().getCqService();
@@ -1000,7 +1000,7 @@ public abstract class DistributedCacheOperation {
      * Sets a flag in the message indicating that this message contains delta
      * bytes.
      * 
-     * @since 6.1
+     * @since GemFire 6.1
      */
     protected void setHasDelta(boolean flag) {
       this.hasDelta = flag;
@@ -1015,7 +1015,7 @@ public abstract class DistributedCacheOperation {
     }
 
     /**
-     * @since 4.2.3
+     * @since GemFire 4.2.3
      */
     protected transient boolean regionAllowsConflation;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
index b6aa1b6..5d71ef2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedPutAllOperation.java
@@ -68,7 +68,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
 /**
  * Handles distribution of a Region.putall operation.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class DistributedPutAllOperation extends AbstractUpdateOperation
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
index cc86e2c..937216f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
@@ -162,7 +162,7 @@ public class DistributedRegion extends LocalRegion implements
   /**
    * Provides a queue for reliable message delivery
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected final ReliableMessageQueue rmq;
 
@@ -684,7 +684,7 @@ public class DistributedRegion extends LocalRegion implements
    * @throws RoleException
    *           if a required role is missing and the LossAction is either
    *           NO_ACCESS or LIMITED_ACCESS.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected boolean isNoDistributionOk()
   {
@@ -703,7 +703,7 @@ public class DistributedRegion extends LocalRegion implements
   /**
    * returns true if this Region does not distribute its operations to other
    * members.
-   * @since 6.0
+   * @since GemFire 6.0
    * @see HARegion#localDestroyNoCallbacks(Object)
    */
   public boolean doesNotDistribute() {
@@ -727,7 +727,7 @@ public class DistributedRegion extends LocalRegion implements
    *          removed from this set.
    * @return the set, possibly null, of recipients that are currently having
    *         their data queued.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected Set adjustForQueuing(Set recipients)
   {
@@ -767,7 +767,7 @@ public class DistributedRegion extends LocalRegion implements
    * @param b
    *          a non-null non-empty set
    * @return true if sets a and b intersect; false if not
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static boolean intersects(Set a, Set b)
   {
@@ -1891,7 +1891,7 @@ public class DistributedRegion extends LocalRegion implements
   /**
    * Distribute the invalidate of a region given its event.
    * This implementation sends the invalidate to peers.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void distributeInvalidateRegion(RegionEventImpl event) {
     new InvalidateRegionOperation(event).distribute();
@@ -3584,7 +3584,7 @@ public class DistributedRegion extends LocalRegion implements
   /**
    * Distribute the PutAllOp.
    * This implementation distributes it to peers.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @Override
   public void postPutAllSend(DistributedPutAllOperation putAllOp, VersionedObjectList successfulPuts) {
@@ -3764,7 +3764,7 @@ public class DistributedRegion extends LocalRegion implements
    * Used to get membership events from our advisor to implement
    * RegionMembershipListener invocations.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected class AdvisorListener implements MembershipListener
   {
@@ -3983,7 +3983,7 @@ public class DistributedRegion extends LocalRegion implements
    * 
    * @param function
    * @param args
-   * @since 5.8
+   * @since GemFire 5.8
    */  
   @Override
   public ResultCollector executeFunction(

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
index 1d216ce..eabefdf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
 /**
  * Handles distribution of a Region.removeAll operation.
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TODO extend DistributedCacheOperation instead
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DummyCachePerfStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DummyCachePerfStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DummyCachePerfStats.java
index 70ec158..8c0eabf 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DummyCachePerfStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DummyCachePerfStats.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.distributed.internal.PoolStatHelper;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class DummyCachePerfStats extends CachePerfStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DynamicRegionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DynamicRegionFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DynamicRegionFactoryImpl.java
index 2064d24..09afc91 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DynamicRegionFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DynamicRegionFactoryImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.DynamicRegionFactory;
 /** This class provides non-published methods that allow the cache
     to initialize and close the factory.
 
-    @since 4.3
+    @since GemFire 4.3
  */
 public class DynamicRegionFactoryImpl extends DynamicRegionFactory {
   /** create an instance of the factory.  This is normally only done

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesMap.java
index 257458f..3db1320 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntriesMap.java
@@ -106,7 +106,7 @@ public interface EntriesMap extends ConcurrentMap {
    * @see InitialImageOperation.RequestImageMessage#chunkEntries
    *
    * @return false if map entry not found
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   public boolean fillInValue(InitialImageOperation.Entry entry, DM mgr);       
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
index 68c8117..16b4016 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java
@@ -134,21 +134,21 @@ public class EntryEventImpl
   /**
    * This field will be null unless this event is used for a putAll operation.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected transient DistributedPutAllOperation putAllOp;
 
   /**
    * This field will be null unless this event is used for a removeAll operation.
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   protected transient DistributedRemoveAllOperation removeAllOp;
 
   /**
    * The member that originated this event
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected DistributedMember distributedMember;
 
@@ -164,7 +164,7 @@ public class EntryEventImpl
   /**
    * The originating membershipId of this event.
    *
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected ClientProxyMembershipID context = null;
   
@@ -443,7 +443,7 @@ public class EntryEventImpl
    * Creates a PutAllEvent given the distributed operation, the region, and the
    * entry data.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   @Retained
   static EntryEventImpl createPutAllEvent(
@@ -1192,7 +1192,7 @@ public class EntryEventImpl
    * Returns the value of the EntryEventImpl field.
    * This is for internal use only. Customers should always call
    * {@link #getCallbackArgument}
-   * @since 5.5 
+   * @since GemFire 5.5
    */
   public Object getRawCallbackArgument() {
     return this.keyInfo.getCallbackArg();
@@ -1518,7 +1518,7 @@ public class EntryEventImpl
 
   /**
    * Forces this entry's new value to be in serialized form.
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public void makeSerializedNewValue() {
     makeSerializedNewValue(false);
@@ -1687,7 +1687,7 @@ public class EntryEventImpl
   /**
    * If we are currently a create op then turn us into an update
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void makeUpdate()
   {
@@ -1697,7 +1697,7 @@ public class EntryEventImpl
   /**
    * If we are currently an update op then turn us into a create
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void makeCreate()
   {
@@ -2580,7 +2580,7 @@ public class EntryEventImpl
   
   /**
    * Return true if this event came from a server by the client doing a get.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean isFromServer() {
     return testEventFlag(EventFlags.FLAG_FROM_SERVER);
@@ -2590,7 +2590,7 @@ public class EntryEventImpl
    * comes from a server while the affected region entry is not locked.  Among
    * other things it causes version conflict checks to be performed to protect
    * against overwriting a newer version of the entry.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setFromServer(boolean v) {
     setEventFlag(EventFlags.FLAG_FROM_SERVER, v);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
index d539366..16215ac 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryOperationImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.Region;
  * Gemfire Context passed to <code>PartitionResolver</code> to compute the
  * data location
  * 
- * @since 5.8
+ * @since GemFire 5.8
  * 
  */
 public class EntryOperationImpl implements EntryOperation {
@@ -64,7 +64,7 @@ public class EntryOperationImpl implements EntryOperation {
    * Return a description of the operation that triggered this event.
    * 
    * @return the operation that triggered this event.
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public Operation getOperation() {
     return this.operation;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntrySnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntrySnapshot.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntrySnapshot.java
index 02d333e..b5c828f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntrySnapshot.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntrySnapshot.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /**
    * A Region.Entry implementation for remote entries and all PR entries
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public class EntrySnapshot implements Region.Entry, DataSerializable {
 private static final long serialVersionUID = -2139749921655693280L;
@@ -78,7 +78,7 @@ private static final long serialVersionUID = -2139749921655693280L;
      * Used by unit tests. Only available on PR.
      * If, at the time this entry was created, it was initialized from a local data store
      * then this method returns true.
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public boolean wasInitiallyLocal() {
       return this.startedLocal;
@@ -131,7 +131,7 @@ private static final long serialVersionUID = -2139749921655693280L;
     /**
      * Makes a copy, if copy-on-get is enabled, of the specified object.
      * 
-     * @since 4.0
+     * @since GemFire 4.0
      */
     private Object conditionalCopy(Object o) {
       return o;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EnumListenerEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EnumListenerEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EnumListenerEvent.java
index 53595a7..1fa5709 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EnumListenerEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EnumListenerEvent.java
@@ -38,7 +38,7 @@ public abstract class EnumListenerEvent
   /**
    * Invoke the correct listener method for this event.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public abstract void dispatchEvent(CacheEvent event, CacheListener listener);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventID.java
index d8a5b72..794d4d7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventID.java
@@ -184,7 +184,7 @@ public final class EventID
 
   /**
    * Returns the thread id used by the calling thread for its event ids
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static long getThreadId() {
     ThreadAndSequenceIDWrapper wrapper = (ThreadAndSequenceIDWrapper)threadIDLocal.get();
@@ -193,7 +193,7 @@ public final class EventID
   /**
    * Returns the next reservable sequence id used by the calling thread for its event ids.
    * Note that the returned id is not yet reserved by the calling thread.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static long getSequenceId() {
     ThreadAndSequenceIDWrapper wrapper = (ThreadAndSequenceIDWrapper)threadIDLocal.get();
@@ -202,7 +202,7 @@ public final class EventID
   /**
    * Reserves and returns a sequence id for the calling thread to be used
    * for an event id.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static long reserveSequenceId() {
     ThreadAndSequenceIDWrapper wrapper = (ThreadAndSequenceIDWrapper)threadIDLocal.get();
@@ -321,7 +321,7 @@ public final class EventID
   /**
    * Returns a byte[] whose contents are calculated by
    * calling {@link #getOptimizedByteArrayForEventID}
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public byte[] calcBytes() {
     return getOptimizedByteArrayForEventID(getThreadID(), getSequenceID());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
index 2f00872..b4d4620 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EventTracker.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch;
  * memberID:threadID.  It is used to avoid replaying events in
  * client/server and partitioned-region configurations.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class EventTracker
 {
@@ -522,7 +522,7 @@ public class EventTracker
    * @param r - a Runnable to wrap the processing of the bulk op
    * @param eventID - the base event ID of the bulk op
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void syncBulkOp(Runnable r, EventID eventID) {
     Assert.assertTrue(eventID != null);
@@ -597,7 +597,7 @@ public class EventTracker
   /**
    * A sequence number tracker to keep events from clients from being
    * re-applied to the cache if they've already been seen.
-   * @since 5.5
+   * @since GemFire 5.5
    */
   static class EventSeqnoHolder implements DataSerializable {
     private static final long serialVersionUID = 8137262960763308046L;
@@ -654,7 +654,7 @@ public class EventTracker
    * membershipID and threadID in the cache
    * processed is true means the bulk op is processed by one thread 
    * no need to redo it by other threads.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   static class BulkOpProcessed {
     /** whether the op is processed */
@@ -693,7 +693,7 @@ public class EventTracker
   /**
    * A holder for the version tags generated for a bulk operation (putAll or removeAll). These
    * version tags are retrieved when a bulk op is retried.
-   * @since 7.0
+   * @since GemFire 7.0
    * protected for test purposes only.
    */
   protected static class BulkOpHolder {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EvictionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EvictionAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EvictionAttributesImpl.java
index 1cb5115..50242aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EvictionAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EvictionAttributesImpl.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController;
  * @see com.gemstone.gemfire.cache.RegionAttributes
  * @see com.gemstone.gemfire.cache.AttributesMutator
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class EvictionAttributesImpl extends EvictionAttributes 
   implements EvictionAttributesMutator
@@ -224,7 +224,7 @@ public final class EvictionAttributesImpl extends EvictionAttributes
   /**
    * Returns true if this object uses a LIFO algorithm
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean isLIFO() {
     return this.algorithm.isLIFO();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
index 7da95f8..54f0b23 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
@@ -186,7 +186,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   /**
    * Test method that causes expiration to be suspended until
    * permitExpiration is called.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public final static void suspendExpiration() {
     synchronized (suspendLock) {
@@ -202,7 +202,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   /**
    * Wait until permission is given for expiration to be done.
    * Tests are allowed to suspend expiration.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private final void waitOnExpirationSuspension() {
       for (;;) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterProfile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterProfile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterProfile.java
index acd0fca..08a6484 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterProfile.java
@@ -86,7 +86,7 @@ import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteHashMap;
  * long integers.  This reduces the size of routing information when sent
  * over the network.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class FilterProfile implements DataSerializableFixedID {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterRoutingInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterRoutingInfo.java
index 6576a18..7f5b587 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FilterRoutingInfo.java
@@ -44,7 +44,7 @@ import java.util.Set;
  * This class is used to hold the information about the servers and
  * their Filters (CQs and Interest List) that are satisfied by the 
  * cache update operation.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class FilterRoutingInfo implements VersionedDataSerializable {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FindDurableQueueProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FindDurableQueueProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FindDurableQueueProcessor.java
index a776487..7ec993a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FindDurableQueueProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FindDurableQueueProcessor.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * A processor for helping a locator find the durable queues for a given durable client id.
  * Asks each bridge server if they have the durable id and builds a list of matching servers.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class FindDurableQueueProcessor extends ReplyProcessor21 {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FixedPartitionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FixedPartitionAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FixedPartitionAttributesImpl.java
index 157586d..d631413 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FixedPartitionAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/FixedPartitionAttributesImpl.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.FixedPartitionAttributes;
 /**
  * Internal implementation of {@link FixedPartitionAttributes}.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public class FixedPartitionAttributesImpl extends FixedPartitionAttributes

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceReattemptException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceReattemptException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceReattemptException.java
index be58e2e..04b95bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceReattemptException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceReattemptException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.Assert;
  * instigate a retry of some sort.
  * 
  * @see com.gemstone.gemfire.internal.cache.partitioned.PartitionMessage
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class ForceReattemptException extends
     DataLocationException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue.java
index 57eb16b..f58fc02 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ForceableLinkedBlockingQueue.java
@@ -68,7 +68,7 @@ import java.util.NoSuchElementException;
  * <a href="{@docRoot}/../technotes/guides/collections/index.html">
  * Java Collections Framework</a>.
  *
- * @since 1.5
+ * @since GemFire 1.5
  * @author Doug Lea
  * @param <E> the type of elements held in this collection
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
index 76a2729..64b4949 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
@@ -277,7 +277,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
    * If true then when a delta is applied the size of the entry value will be recalculated. If false (the default) then
    * the size of the entry value is unchanged by a delta application. Not a final so that tests can change this value.
    *
-   * @since hitachi 6.1.2.9
+   * @since GemFire hitachi 6.1.2.9
    */
   public static boolean DELTAS_RECALCULATE_SIZE = Boolean.getBoolean("gemfire.DELTAS_RECALCULATE_SIZE");
 
@@ -569,7 +569,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   
   /**
    * {@link ExtensionPoint} support.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private SimpleExtensionPoint<Cache> extensionPoint = new SimpleExtensionPoint<Cache>(this, this);
   
@@ -1389,7 +1389,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * create diskstore factory with default attributes
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public DiskStoreFactory createDiskStoreFactory() {
     return new DiskStoreFactoryImpl(this);
@@ -1398,7 +1398,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * create diskstore factory with predefined attributes
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public DiskStoreFactory createDiskStoreFactory(DiskStoreAttributes attrs) {
     return new DiskStoreFactoryImpl(this, attrs);
@@ -1499,14 +1499,14 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Set to true during a cache close if user requested durable subscriptions to be kept.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private boolean keepAlive;
 
   /**
    * Returns true if durable subscriptions (registrations and queries) should be preserved.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean keepDurableSubscriptionsAlive() {
     return this.keepAlive;
@@ -2483,7 +2483,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns the DiskStore by name
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public DiskStore findDiskStore(String name) {
     if (name == null) {
@@ -2495,7 +2495,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns the DiskStore list
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public Collection<DiskStoreImpl> listDiskStores() {
     return Collections.unmodifiableCollection(this.diskStores.values());
@@ -2701,7 +2701,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns the member id of my distributed system
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public InternalDistributedMember getMyId() {
     return this.system.getDistributedMember();
@@ -2839,7 +2839,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns the date and time that this cache was created.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Date getCreationDate() {
     return this.creationDate;
@@ -2848,7 +2848,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns the number of seconds that have elapsed since the Cache was created.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public int getUpTime() {
     return (int) ((System.currentTimeMillis() - this.creationDate.getTime()) / 1000);
@@ -3215,7 +3215,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * returns a set of all current regions in the cache, including buckets
    *
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Set<LocalRegion> getAllRegions() {
     Set<LocalRegion> result = new HashSet();
@@ -3468,7 +3468,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Called by ccn when a client goes away
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void cleanupForClient(CacheClientNotifier ccn, ClientProxyMembershipID client) {
     try {
@@ -3623,7 +3623,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns true if get should give a copy; false if a reference.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   final boolean isCopyOnRead() {
     return this.copyOnRead;
@@ -3632,7 +3632,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Implementation of {@link com.gemstone.gemfire.cache.Cache#setCopyOnRead}
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setCopyOnRead(boolean copyOnRead) {
     this.copyOnRead = copyOnRead;
@@ -3641,7 +3641,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Implementation of {@link com.gemstone.gemfire.cache.Cache#getCopyOnRead}
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   final public boolean getCopyOnRead() {
     return this.copyOnRead;
@@ -3728,7 +3728,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
    *
    * @return the CacheTransactionManager instance.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public CacheTransactionManager getCacheTransactionManager() {
     return this.txMgr;
@@ -3785,7 +3785,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
    * Returns the <code>Executor</code> (thread pool) that is used to execute cache event listeners.
    * Returns <code>null</code> if no pool exists.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   Executor getEventThreadPool() {
     return this.eventThreadPool;
@@ -4210,7 +4210,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
 
   /**
    * @return Context jndi context associated with the Cache.
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Context getJNDIContext() {
     // if (isClient()) {
@@ -4221,7 +4221,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
 
   /**
    * @return JTA TransactionManager associated with the Cache.
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public javax.transaction.TransactionManager getJTATransactionManager() {
     // if (isClient()) {
@@ -4338,7 +4338,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Returns this cache's ReliableMessageQueueFactory.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public ReliableMessageQueueFactory getReliableMessageQueueFactory() {
     return this.rmqFactory;
@@ -4534,7 +4534,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   
   /**
    * Returns the QueryMonitor instance based on system property MAX_QUERY_EXECUTION_TIME.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public QueryMonitor getQueryMonitor() {
     //Check to see if monitor is required if ResourceManager critical heap percentage is set
@@ -4579,7 +4579,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   /**
    * Simple class to allow waiters for register interest. Has at most one thread that ever calls wait.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private class SimpleWaiter {
     private boolean notified = false;
@@ -4641,7 +4641,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K, V> RegionFactory<K, V> createRegionFactory(RegionShortcut atts) {
     if (isClient()) {
@@ -4652,7 +4652,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K, V> RegionFactory<K, V> createRegionFactory() {
     if (isClient()) {
@@ -4662,7 +4662,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K, V> RegionFactory<K, V> createRegionFactory(String regionAttributesId) {
     if (isClient()) {
@@ -4672,7 +4672,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K, V> RegionFactory<K, V> createRegionFactory(RegionAttributes<K, V> regionAttributes) {
     if (isClient()) {
@@ -4682,7 +4682,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K, V> ClientRegionFactory<K, V> createClientRegionFactory(ClientRegionShortcut atts) {
     return new ClientRegionFactoryImpl<K, V>(this, atts);
@@ -4693,7 +4693,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public QueryService getQueryService(String poolName) {
     Pool p = PoolManager.find(poolName);
@@ -5311,7 +5311,7 @@ public class GemFireCacheImpl implements InternalCache, ClientCache, HasCachePer
   
   /**
    * @see Extensible#getExtensionPoint()
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Override
   public ExtensionPoint<Cache> getExtensionPoint() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
index fd350a0..ec5fc4e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GridAdvisor.java
@@ -297,7 +297,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
      * Tell local controllers about the received profile. Also if exchange
      * profiles then add each local controller to reply.
      * 
-     * @since 5.7
+     * @since GemFire 5.7
      */
     protected final void tellLocalControllers(boolean removeProfile,
         boolean exchangeProfiles, final List<Profile> replyProfiles) {
@@ -324,7 +324,7 @@ public abstract class GridAdvisor extends DistributionAdvisor {
      * Tell local bridge servers about the received profile. Also if exchange
      * profiles then add each local bridge server to reply.
      * 
-     * @since 5.7
+     * @since GemFire 5.7
      */
     protected final void tellLocalBridgeServers(boolean removeProfile,
         boolean exchangeProfiles, final List<Profile> replyProfiles) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/HARegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/HARegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/HARegion.java
index c924be5..cac3d0a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/HARegion.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
  * This region is being implemented to suppress distribution of puts and to
  * allow localDestroys on mirrored regions.
  * 
- * @since 4.3
+ * @since GemFire 4.3
  *  
  */
 public final class HARegion extends DistributedRegion
@@ -116,7 +116,7 @@ public final class HARegion extends DistributedRegion
 
   /**
    * Updates never distributed from buckets.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @Override
   protected void distributeUpdate(EntryEventImpl event, long lastModifiedTime, boolean ifNew, boolean ifOld, Object expectedOldValue, boolean requireOldValue) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/IncomingGatewayStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/IncomingGatewayStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/IncomingGatewayStatus.java
index 11c8a35..abcbcf1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/IncomingGatewayStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/IncomingGatewayStatus.java
@@ -26,7 +26,7 @@ import java.net.InetAddress;
  * used by the monitoring tool.
  *
  *
- * @since 4.3
+ * @since GemFire 4.3
  */
 public class IncomingGatewayStatus implements Serializable {
   private static final long serialVersionUID = -4579815367602658353L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
index bda5a27..20f5f49 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCache.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.extension.Extensible;
  * not be part of the "public" API of the implementing class.
  * </p>
  * @see com.gemstone.gemfire.cache.Cache
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface InternalCache extends Cache, Extensible<Cache> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCacheEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCacheEvent.java
index 4497bbb..da2d385 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCacheEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalCacheEvent.java
@@ -41,7 +41,7 @@ public interface InternalCacheEvent extends CacheEvent
   public boolean isBridgeEvent();
   /**
    * Answers true if this event is from a client
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean hasClientOrigin();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalDataView.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalDataView.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalDataView.java
index 0885477..2452804 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalDataView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalDataView.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.VersionedObjectList;
 import com.gemstone.gemfire.internal.offheap.annotations.Retained;
 
 /**
- * @since 6.0tx
+ * @since GemFire 6.0tx
  */
 public interface InternalDataView {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
index f7d46fe..7974418 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/InternalRegionArguments.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
  * An internal version of Region Attributes that allows for additional information
  * to be passed to the Region constructors, typically for internal purposes, for example
  * internally GemFire may need use a Region and flag it for internal use only.
- * @since 4.2.3
+ * @since GemFire 4.2.3
  */
 public final class InternalRegionArguments
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperFactory.java
index 75925ba..707ee2d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperFactory.java
@@ -18,7 +18,7 @@
  * The LoaderHelperFactory inspiration came 
  * from a need to allow Partitioned Regions to generate a LoaderHelper that was
  * outside the context of the Region the loader invoked from.
- * @since 5.0
+ * @since GemFire 5.0
  */
 package com.gemstone.gemfire.internal.cache;
 
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.LoaderHelper;
  * The LoaderHelperFactory creates a LoaderHelper class which is used by a 
  * {@link com.gemstone.gemfire.cache.CacheLoader}.
  *  
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface LoaderHelperFactory
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperImpl.java
index 3c3c8ff..55a10b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LoaderHelperImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.i18n.StringId;
  *
  *
  * @see CacheLoader#load(LoaderHelper) load
- * @since 2.0
+ * @since GemFire 2.0
  */
 public class LoaderHelperImpl implements LoaderHelper
 {


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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/Alert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/Alert.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/Alert.java
index 4d7329b..17da3af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/Alert.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/Alert.java
@@ -52,7 +52,7 @@ public interface Alert {
    * @return the InternalDistributedMember instance representing a member that
    *         is sending/has sent this alert
    *
-   * @since 6.5        
+   * @since GemFire 6.5
    */
   public InternalDistributedMember getSender();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/CacheInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/CacheInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/CacheInfo.java
index 5c023ec..3faa8e8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/CacheInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/CacheInfo.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.admin;
 /**
  * Describes a cache from a GemFireVM's point of view.
  * 
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface CacheInfo {
   /**
@@ -88,14 +88,14 @@ public interface CacheInfo {
    * Returns the ids of all of the bridge servers that are associated
    * with this cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public int[] getBridgeServerIds();
 
   /**
    * Returns whether or not this is a cache "server"
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isServer();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GemFireVM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GemFireVM.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GemFireVM.java
index e51b964..6c9837e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GemFireVM.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GemFireVM.java
@@ -69,7 +69,7 @@ public interface GemFireVM {
   /**
    * Returns the directory in which the member runs
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public java.io.File getWorkingDirectory();
 
@@ -85,7 +85,7 @@ public interface GemFireVM {
 
   /**
    * Returns a String describing the vm's gemfire version info
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public String getVersionInfo();
 
@@ -122,20 +122,20 @@ public interface GemFireVM {
    * If a health listener has already been added it will be removed
    * and a new one added.
    * @param cfg determines how and when the health will be checked.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void addHealthListener(HealthListener observer,
                                 GemFireHealthConfig cfg);
   
   /**
    * Removes an added health listener.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void removeHealthListener();
 
   /**
    * Resets the current health status to "good".
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void resetHealthStatus();
 
@@ -148,7 +148,7 @@ public interface GemFireVM {
    * @param healthCode
    *        The current health status
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public String[] getHealthDiagnosis(GemFireHealth.Health healthCode);
 
@@ -161,14 +161,14 @@ public interface GemFireVM {
    * Returns the runtime {@link com.gemstone.gemfire.admin.GemFireMemberStatus} from the vm
    * The idea is this snapshot is similar to stats that represent the current state of a 
    * running VM. However, this is a bit higher level than a stat 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public GemFireMemberStatus getSnapshot();
   
   /**
    * Returns the runtime {@link com.gemstone.gemfire.admin.RegionSubRegionSnapshot} from the vm
    * The idea is this snapshot is quickly salvageable to present a cache's region's info 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public RegionSubRegionSnapshot getRegionSnapshot();
   
@@ -218,7 +218,7 @@ public interface GemFireVM {
    * @param path the path to the region
    * @return the Region or null if not found
    * @throws IllegalArgumentException if path is null, the empty string, or "/"
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Region getRegion(CacheInfo c, String path);
 
@@ -229,7 +229,7 @@ public interface GemFireVM {
    * @throws AdminException
    *         If an error occurs while creating the region
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Region createVMRootRegion(CacheInfo c, String name,
                                    RegionAttributes attrs)
@@ -242,7 +242,7 @@ public interface GemFireVM {
    * @throws AdminException
    *         If an error occurs while creating the region
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Region createSubregion(CacheInfo c, String parentPath,
                                 String name, RegionAttributes attrs)
@@ -319,7 +319,7 @@ public interface GemFireVM {
   /**
    * Adds a bridge server a cache in this VM
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public AdminBridgeServer addCacheServer(CacheInfo cache)
     throws AdminException;
@@ -338,7 +338,7 @@ public interface GemFireVM {
   /**
    * Starts a bridge server in this VM
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public AdminBridgeServer startBridgeServer(CacheInfo cache,
                                              AdminBridgeServer bridge)
@@ -347,7 +347,7 @@ public interface GemFireVM {
   /**
    * Stops a bridge server in this VM
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public AdminBridgeServer stopBridgeServer(CacheInfo cache,
                                             AdminBridgeServer bridge)
@@ -363,7 +363,7 @@ public interface GemFireVM {
    * @param refreshInterval refresh interval to be used by the Alerts Manager
    * @param setRemotely whether to be set on remote VM
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval, boolean setRemotely);
   
@@ -374,7 +374,7 @@ public interface GemFireVM {
    * 
    * @param refreshInterval refresh interval to set (in milliseconds)
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setRefreshInterval(long refreshInterval);
   
@@ -388,7 +388,7 @@ public interface GemFireVM {
    *                   UpdateAlertDefinitionRequestUPDATE_ALERT_DEFINITION, 
    *                   UpdateAlertDefinitionRequest.REMOVE_ALERT_DEFINITION
    *                   
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GfManagerAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GfManagerAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GfManagerAgent.java
index a9e1df0..07a368d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GfManagerAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/GfManagerAgent.java
@@ -45,7 +45,7 @@ public interface GfManagerAgent {
    * Returns whether or not this manager agent has created admin
    * objects for the initial members of the distributed system.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isInitialized();
 
@@ -92,7 +92,7 @@ public interface GfManagerAgent {
   /**
    * Returns the distribution manager used by this manager agent.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public DM getDM();
 
@@ -105,7 +105,7 @@ public interface GfManagerAgent {
    * Returns the distributed system that is administered by this
    * agent.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public InternalDistributedSystem getDSConnection();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/HealthListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/HealthListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/HealthListener.java
index e92b16f..b35213d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/HealthListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/HealthListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.admin.GemFireHealth;
  *
  * @see com.gemstone.gemfire.admin.GemFireHealthConfig
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface HealthListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 6553727..97d907a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -110,7 +110,7 @@ public class SSLConfig {
    * configuration information used by {@link
    * com.gemstone.gemfire.distributed.DistributedSystem#connect}.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void toDSProperties(Properties props) {
     props.setProperty(DistributionConfig.SSL_ENABLED_NAME,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
index 2834f04..90d00e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * @see StatAlert
  * 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class StatAlertsManager {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerRequest.java
index 2078094..c3a9eb4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerRequest.java
@@ -30,7 +30,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * add a health listener.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class AddHealthListenerRequest extends AdminRequest {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerResponse.java
index d04ed6d..244d349 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AddHealthListenerResponse.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * The response to adding a health listener.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class AddHealthListenerResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminConsoleDisconnectMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminConsoleDisconnectMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminConsoleDisconnectMessage.java
index e58f57a..2f8d336 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminConsoleDisconnectMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminConsoleDisconnectMessage.java
@@ -72,7 +72,7 @@ public final class AdminConsoleDisconnectMessage extends PooledDistributionMessa
   /**
    * @param reason the reason for getting disconnected
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setReason(String reason) {
     this.reason = reason;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminReplyProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminReplyProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminReplyProcessor.java
index 2b7ea34..7624dc9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminReplyProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AdminReplyProcessor.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
  * An <code>AdminReplyProcessor</code> can be {@linkplain #cancel
  * cancelled}.  
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 class AdminReplyProcessor extends ReplyProcessor21 {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertLevelChangeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertLevelChangeMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertLevelChangeMessage.java
index ee18092..7047079 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertLevelChangeMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertLevelChangeMessage.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  *
  * @see AlertLevel
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class AlertLevelChangeMessage extends SerialDistributionMessage {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertsNotificationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertsNotificationMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertsNotificationMessage.java
index cd18f3b..44b020d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertsNotificationMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/AlertsNotificationMessage.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.admin.StatAlert;
  * Distribution message to be sent to alert aggregator
  * {@link StatAlertsAggregator} It wraps alert objects{@link StatAlert}
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class AlertsNotificationMessage extends PooledDistributionMessage {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerRequest.java
index 6aabe6b..b19d91c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
  * A message that is sent to a VM that hosts a cache to perform an
  * administrative operation on one of its bridge servers.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class BridgeServerRequest extends AdminRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerResponse.java
index 0204500..f9e5258 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/BridgeServerResponse.java
@@ -31,7 +31,7 @@ import java.util.*;
  * BridgeServerResponse}.  It perform an operation on a bridge server
  * and returns the result to the sender.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class BridgeServerResponse extends AdminResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigRequest.java
index 4eed9a8..0e9c4df 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigRequest.java
@@ -30,7 +30,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * get information on its current cache.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class CacheConfigRequest extends AdminRequest {
   private byte attributeCode;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigResponse.java
index 5484de1..3933e44 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheConfigResponse.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * A message that is sent in response to a {@link CacheConfigRequest}.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class CacheConfigResponse extends AdminResponse {
   // instance variables
@@ -39,7 +39,7 @@ public final class CacheConfigResponse extends AdminResponse {
   
   /** An exception thrown while configuring the cache
    *
-   * @since 4.0 */
+   * @since GemFire 4.0 */
   private Exception exception;
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoRequest.java
index 784a5da..66fb5cb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * get information on its current cache.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class CacheInfoRequest extends AdminRequest {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoResponse.java
index 8793e99..354c2e9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/CacheInfoResponse.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * A message that is sent in response to a {@link CacheInfoRequest}.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class CacheInfoResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ChangeRefreshIntervalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ChangeRefreshIntervalMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ChangeRefreshIntervalMessage.java
index 9f1ed65..77662a6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ChangeRefreshIntervalMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ChangeRefreshIntervalMessage.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.admin.StatAlertsManager;
  * 
  * @see StatAlertsManager
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ChangeRefreshIntervalMessage extends PooledDistributionMessage {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
index b42e6aa..cf8f7a1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
@@ -236,21 +236,21 @@ public class DistributionLocatorId implements java.io.Serializable {
   }
   
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean isPeerLocator() {
     return this.peerLocator;
   }
   
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean isServerLocator() {
     return this.serverLocator;
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getHostnameForClients() {
     return this.hostnameForClients;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoRequest.java
index 47b0afe..76efe96 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoRequest.java
@@ -26,7 +26,7 @@ import java.io.*;
  * information about a durable client's proxy in the bridge-servers of its
  * current cache.
  * 
- * @since 5.6
+ * @since GemFire 5.6
  * 
  */
 public class DurableClientInfoRequest extends AdminRequest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoResponse.java
index bb4664c..273dff5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DurableClientInfoResponse.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 /**
  * A message that is sent in response to a {@link DurableClientInfoRequest}.
  * 
- * @since 5.6
+ * @since GemFire 5.6
  */
 public class DurableClientInfoResponse extends AdminResponse
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisRequest.java
index 7642e02..22ee035 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisRequest.java
@@ -27,7 +27,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * fetch its health diagnosis
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class FetchHealthDiagnosisRequest extends AdminRequest {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisResponse.java
index b4c44ff..19590ae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHealthDiagnosisResponse.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * The response to fetching the health diagnosis.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class FetchHealthDiagnosisResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/HealthListenerMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/HealthListenerMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/HealthListenerMessage.java
index 2047821..fd34fa3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/HealthListenerMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/HealthListenerMessage.java
@@ -31,7 +31,7 @@ import java.io.*;
  * A message that is sent to a particular agent who was registered
  * a health listener on a GemFireVM. This message is only sent when
  * the health status changes.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class HealthListenerMessage extends PooledDistributionMessage implements AdminMessageType {
   //instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionRequest.java
index 930ad8f..e078197 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular application to get the
  * region for the specified path.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class RegionRequest extends AdminRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionResponse.java
index 0679f56..8077d5f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RegionResponse.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * Responds to {@link RegionResponse}.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class RegionResponse extends AdminResponse {
 //   instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteAlert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteAlert.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteAlert.java
index fe2c547..6b89b7b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteAlert.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteAlert.java
@@ -97,7 +97,7 @@ public class RemoteAlert implements Alert {
    * @return the InternalDistributedMember instance representing a member that
    *         is sending/has sent this alert
    *         
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public InternalDistributedMember getSender() {
     return sender;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteBridgeServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteBridgeServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteBridgeServer.java
index e5727f1..fa0d26e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteBridgeServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteBridgeServer.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * that is passed between administration VMs and VMs that host caches
  * with bridge servers.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class RemoteBridgeServer
   extends AbstractCacheServer
@@ -253,7 +253,7 @@ public class RemoteBridgeServer
    * @param listener
    *                The <code>InterestRegistrationListener</code> to register
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void registerInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -271,7 +271,7 @@ public class RemoteBridgeServer
    *                The <code>InterestRegistrationListener</code> to
    *                unregister
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void unregisterInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -288,7 +288,7 @@ public class RemoteBridgeServer
    * @return a read-only set of <code>InterestRegistrationListener</code>s
    *         registered with this notifier
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public Set getInterestRegistrationListeners() {
     final String s = LocalizedStrings.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGemFireVM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGemFireVM.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGemFireVM.java
index 9fbef6a..7374222 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGemFireVM.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGemFireVM.java
@@ -635,7 +635,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
    *                the 'durable-client-id' for the client
    * @return - true if the member contains a durable-queue for the given client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean hasDurableClient(String durableClientId)
   {
@@ -655,7 +655,7 @@ public abstract class RemoteGemFireVM implements GemFireVM {
    * @return - true if the member contains a primary durable-queue for the given
    *         client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean isPrimaryForDurableClient(String durableClientId)
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
index c8ba64d..29dc6c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
@@ -93,7 +93,7 @@ public
   /** The connection to the distributed system through which this
    * admin agent communicates
    *
-   * @since 4.0 */
+   * @since GemFire 4.0 */
   protected InternalDistributedSystem system;
 
   /** Is this agent connected to the distributed system */
@@ -426,7 +426,7 @@ public
    * Returns whether or not this manager agent has created admin
    * objects for the initial members of the distributed system.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isInitialized() {
     return this.initialized;
@@ -920,7 +920,7 @@ public
    * Returns the thread group in which admin threads should run.  This
    * thread group handles uncaught exceptions nicely.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public ThreadGroup getThreadGroup() {
     return this.threadGroup;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
index 77f335b..0a4e057 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
@@ -59,7 +59,7 @@ public class RemoteTransportConfig implements TransportConfig {
    * We assume that <code>config</code> already been checked for
    * errors.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public RemoteTransportConfig(DistributionConfig config, int vmKind) {
     if (config.getBindAddress() == null) {
@@ -259,7 +259,7 @@ public class RemoteTransportConfig implements TransportConfig {
    * appropriate to use with {@link
    * com.gemstone.gemfire.distributed.DistributedSystem#connect}.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   Properties toDSProperties() {
     Properties props = new Properties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerRequest.java
index 1385472..35bae00 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerRequest.java
@@ -29,7 +29,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * remove a health listener.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class RemoveHealthListenerRequest extends AdminRequest {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerResponse.java
index 4187e45..5b4a07a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoveHealthListenerResponse.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * The response to adding a health listener.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class RemoveHealthListenerResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusRequest.java
index 5b3aa5c..8522f59 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusRequest.java
@@ -29,7 +29,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * reset its current health status.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class ResetHealthStatusRequest extends AdminRequest {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusResponse.java
index e0bf591..a126813 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ResetHealthStatusResponse.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * The response to reseting the health status.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class ResetHealthStatusResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
index 76b94bf..23fc3a2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/ShutdownAllGatewayHubsRequest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.internal.ReplyMessage;
  * should be removed but it it there for rolling upgrade support when request
  * come from old version member to shut down hubs.
  * 
- * @since 9.0
+ * @since Geode 1.0
  *
  */
 public class ShutdownAllGatewayHubsRequest extends DistributionMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/StatAlertsManagerAssignMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/StatAlertsManagerAssignMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/StatAlertsManagerAssignMessage.java
index 871d3ec..6d13d52 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/StatAlertsManagerAssignMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/StatAlertsManagerAssignMessage.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.admin.StatAlertsManager;
  * This class represents a request object to set an alert manager for the newly
  * joined member.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class StatAlertsManagerAssignMessage extends PooledDistributionMessage {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoRequest.java
index 3650e67..6596053 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoRequest.java
@@ -28,7 +28,7 @@ import java.io.*;
 /**
  * A message that is sent to a particular distribution manager to
  * get its current version info.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class VersionInfoRequest extends AdminRequest {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoResponse.java
index 8cea1d9..754dec0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionInfoResponse.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 
 /**
  * A message that is sent in response to a {@link VersionInfoRequest}.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public final class VersionInfoResponse extends AdminResponse {
   // instance variables

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionMismatchAlert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionMismatchAlert.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionMismatchAlert.java
index 742f7df..b6985ee 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionMismatchAlert.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/VersionMismatchAlert.java
@@ -57,7 +57,7 @@ public class VersionMismatchAlert implements Alert {
    * @return the InternalDistributedMember instance representing this agent
    *         instance
    *         
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public InternalDistributedMember getSender() {
     return this.sender;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java
index 4f4edfc..d473f9b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractCacheServer.java
@@ -38,7 +38,7 @@ import java.util.Set;
  * Abstract class that contains common code that all true implementations
  * of {@link CacheServer} can use.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public abstract class AbstractCacheServer implements CacheServer {
 
@@ -87,7 +87,7 @@ public abstract class AbstractCacheServer implements CacheServer {
   protected int messageTimeToLive;
   /**
    * The groups this server belongs to. Use <code>getGroups</code> to read.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected String[] groups;
   
@@ -95,13 +95,13 @@ public abstract class AbstractCacheServer implements CacheServer {
 
   /**
    * The ip address or host name that this server is to listen on.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected String bindAddress;
   /**
    * The ip address or host name that will be given to clients so they can connect
    * to this server
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected String hostnameForClients;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskLRURegionEntry.java
index dfd4056..a193014 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskLRURegionEntry.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.lru.LRUEntry;
  * Abstract implementation class of RegionEntry interface.
  * This adds LRU support behavior to entries that already have Disk support.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegion.java
index d74afb3..231aa7a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractDiskRegion.java
@@ -50,7 +50,7 @@ import joptsimple.internal.Strings;
  * Code shared by both DiskRegion and RecoveredDiskRegion.
  *
  *
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 public abstract class AbstractDiskRegion implements DiskRegionView {
   private static final Logger logger = LogService.getLogger();
@@ -702,7 +702,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView {
   /**
    * gets the number of entries recovered
    * 
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   public int getRecoveredEntryCount() {
     return this.recoveredEntryCount;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionEntry.java
index aa5656d..036b8a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionEntry.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.lru.LRUEntry;
  * Abstract implementation class of RegionEntry interface.
  * This adds LRU support behaviour
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionMap.java
index 14c431d..c9b3038 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractLRURegionMap.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.size.ReflectionSingleObjectSizer;
 /**
  * Abstract implementation of {@link RegionMap} that adds LRU behaviour.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */
@@ -171,7 +171,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
    * @param cd the CachedDeserializable whose form has changed
    * @param v the new form of the CachedDeserializable's value.
    * @return true if finishExpandValue needs to be called
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public boolean beginChangeValueForm(LRUEntry le, CachedDeserializable cd, Object v) {
     // make sure this cached deserializable is still in the entry
@@ -217,7 +217,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
   }
 
   /**
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public void finishChangeValueForm() {
     lruUpdateCallback();
@@ -626,7 +626,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap {
   /**
    * Update counter related to limit in list
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   // TODO this method acts as LRUupdateCallbacks
   // do we need to put it here are insert one level up

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractOplogDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractOplogDiskRegionEntry.java
index 371c49c..d9b1008 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractOplogDiskRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractOplogDiskRegionEntry.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
  * Abstract implementation class of RegionEntry interface.
  * This is adds Disk support behavior
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java
index 8651cc8..2e510b3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegion.java
@@ -202,7 +202,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
 
   /**
    * True if this region uses off-heap memory; otherwise false (default)
-   * @since 9.0
+   * @since Geode 1.0
    */
   protected boolean offHeap;
 
@@ -258,7 +258,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   
   /**
    * @see #getExtensionPoint()
-   * @since 8.1
+   * @since GemFire 8.1
    */
   protected ExtensionPoint<Region<?,?>> extensionPoint = new SimpleExtensionPoint<Region<?,?>>(this, this);
   
@@ -278,7 +278,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Unit test constructor. DO NOT USE!
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    * @deprecated For unit testing only. Use
    *             {@link #AbstractRegion(GemFireCacheImpl, RegionAttributes, String, InternalRegionArguments)}
    *             .
@@ -477,7 +477,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Return a cache loader if this region has one.
    * Note if region's loader is used to implement bridge then null is returned.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheLoader basicGetLoader() {
     CacheLoader result = this.cacheLoader;
@@ -486,7 +486,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Return a cache writer if this region has one.
    * Note if region's writer is used to implement bridge then null is returned.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheWriter basicGetWriter() {
     CacheWriter result = this.cacheWriter;
@@ -1601,7 +1601,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Returns true if this region has no storage
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected final boolean isProxy()
   {
@@ -1612,7 +1612,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
    * Returns true if this region has no storage and is only interested in what
    * it contains (which is nothing)
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected final boolean isCacheContentProxy()
   {
@@ -1624,7 +1624,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Returns true if region subscribes to all events or is a replicate.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   final boolean isAllEvents()
   {
@@ -1790,7 +1790,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   /**
    * Returns the pool this region is using or null if it does not have one
    * or the pool does not exist.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private PoolImpl getPool() {
     PoolImpl result = null;
@@ -1880,7 +1880,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
    * @throws RoleException
    *           if a required role was not sent the message and the LossAction is
    *           either NO_ACCESS or LIMITED_ACCESS.
-   * @since 5.0
+   * @since GemFire 5.0
    *
    */
   protected void handleReliableDistribution(ReliableDistributionData data,
@@ -1973,7 +1973,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes,
   }
   
   /**
-  * @since 8.1
+  * @since GemFire 8.1
   */
   @Override
   public ExtensionPoint<Region<?, ?>> getExtensionPoint() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
index 25cc818..8075367 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
@@ -85,7 +85,7 @@ import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl;
  * This is the topmost implementation class so common behavior
  * lives here.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
index 0cbec19..68f28d6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
@@ -86,7 +86,7 @@ import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMa
  * Abstract implementation of {@link RegionMap}that has all the common
  * behavior.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java
index 59a669b..5a6351e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractUpdateOperation.java
@@ -125,7 +125,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation
    * @param ev the event describing the operation
    * @param lastMod the modification timestamp for this op
    * @return true if the update was done.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static boolean doPutOrCreate(LocalRegion rgn, EntryEventImpl ev, long lastMod) {
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
index c241c6b..0c53d4b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
@@ -2378,7 +2378,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor  {
    * DistributedCacheOperation messages and notification-only partition
    * messages
    * @return a set of recipients requiring both cache-op and notification messages
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set adviseRequiresTwoMessages() {
     return adviseNotInitialized();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
index e2482bb..4d51eb8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
@@ -103,7 +103,7 @@ import com.gemstone.gemfire.internal.concurrent.AtomicLong5;
  * Primary election for a BucketRegion can be found in the 
  * {@link com.gemstone.gemfire.internal.cache.BucketAdvisor} class
  * 
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public class BucketRegion extends DistributedRegion
@@ -1327,7 +1327,7 @@ implements Bucket
    * Return true if this bucket has been destroyed.
    * Don't bother checking to see if the PR that owns this bucket was destroyed;
    * that has already been checked.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isBucketDestroyed() {
     return super.isDestroyed();
@@ -2044,7 +2044,7 @@ implements Bucket
 
   /* (non-Javadoc)
    * @see com.gemstone.gemfire.internal.cache.partitioned.Bucket#getBucketOwners()
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public Set getBucketOwners() {
     return getBucketAdvisor().getProxyBucketRegion().getBucketOwners();    

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionEvictior.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionEvictior.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionEvictior.java
index 497d526..fca7801 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionEvictior.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionEvictior.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
  * Takes delta to be evicted and tries to evict the least no of LRU entry which
  * would make evictedBytes more than or equal to the delta
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class BucketRegionEvictior implements Callable<Object> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation.java
index 46c6a38..03ceab1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
  * Represents the {@link ServerLocation} of a {@link BucketRegion}
  * 
  * 
- * @since 6.5 
+ * @since GemFire 6.5
  */
 @SuppressWarnings("serial")
 public class BucketServerLocation extends ServerLocation {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation66.java
index 73d9da0..b2c79e1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketServerLocation66.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
  * Represents the {@link ServerLocation} of a {@link BucketRegion}
  * 
  * 
- * @since 6.5 
+ * @since GemFire 6.5
  */
 @SuppressWarnings("serial")
 public class BucketServerLocation66 extends ServerLocation {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BytesAndBitsForCompactor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BytesAndBitsForCompactor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BytesAndBitsForCompactor.java
index f571d45..e4048a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BytesAndBitsForCompactor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BytesAndBitsForCompactor.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * for rolling the entries. The reason for this class is to reuse the
  * underlying byte array for rolling multiple entries there by
  * reducing the garbage.
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class BytesAndBitsForCompactor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheClientStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheClientStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheClientStatus.java
index d57ec38..44e17f1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheClientStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheClientStatus.java
@@ -26,7 +26,7 @@ import java.util.List;
  * from the server's perspective. This class is used by the monitoring tool.
  *
  *
- * @since 4.3
+ * @since GemFire 4.3
  */
 public class CacheClientStatus implements Serializable {
   private static final long serialVersionUID = -56148046466517217L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheConfig.java
index 991d143..4035645 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheConfig.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.pdx.internal.AutoSerializableManager;
  * This is helper class used by CacheFactory to pass the cache configuration
  *  values to cache creation code.
  *  
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CacheConfig {
   public static boolean DEFAULT_PDX_READ_SERIALIZED = false;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisee.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisee.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisee.java
index 7b13f21..3163c32 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisee.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisee.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor.CacheProfile
 /**
  * Distributed cache object (typically a <code>Region</code>) which uses
  * a {@link CacheDistributionAdvisor}.
- * @since 5.1
+ * @since GemFire 5.1
  */
 public interface CacheDistributionAdvisee extends DistributionAdvisee {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
index 4a34771..2e60c55 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor.java
@@ -256,7 +256,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
   /**
    * Same as adviseCacheOp but only includes members that are playing the
    * specified role.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public Set adviseCacheOpRole(final Role role) {
     return adviseFilter(new Filter() {
@@ -447,7 +447,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
   /**
    * returns the set of all the members in the system which requires old values
    * and are not yet finished with initialization (including GII).
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public Set adviseRequiresOldValueInCacheOp( ) {
     return adviseFilter(new Filter() {
@@ -536,7 +536,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
      * This information may be incorrect for a PartitionedRegion, but
      * may be relied upon for DistributedRegions (including BucketRegions)
      * 
-     * @since prpersist this field is now overloaded for partitioned regions with persistence.
+     * @since GemFire prpersist this field is now overloaded for partitioned regions with persistence.
      * In the case of pr persistence, this field indicates that the region has finished
      * recovery from disk.
      */
@@ -697,7 +697,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
 
     /**
      * Sets the SubscriptionAttributes for the region that this profile is on
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public void setSubscriptionAttributes(SubscriptionAttributes sa) {
       this.subscriptionAttributes = sa;
@@ -998,7 +998,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
    * memberIds
    * @param oldRecipients the <code>Set</code> of memberIds that have received the message
    * @return the set of new replicate's memberIds
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public Set adviseNewReplicates(final Set oldRecipients)
   {
@@ -1023,7 +1023,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
    * Provide all the replicates including persistent replicates.
    * 
    * @return the set of replicate's memberIds
-   * @since 5.8
+   * @since GemFire 5.8
    */
   public Set<InternalDistributedMember> adviseReplicates() {
     return adviseFilter(new Filter() {
@@ -1042,7 +1042,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
    * Provide only the preloadeds given a set of existing memberIds
    * 
    * @return the set of preloaded's memberIds
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   public Set advisePreloadeds() {
     return adviseFilter(new Filter() {
@@ -1062,7 +1062,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
    * memberIds
    * 
    * @return the set of replicate's memberIds
-   * @since 5.8
+   * @since GemFire 5.8
    */
   public Set adviseEmptys() {
     return adviseFilter(new Filter() {
@@ -1080,7 +1080,7 @@ public class CacheDistributionAdvisor extends DistributionAdvisor  {
    * Provide only the normals (having DataPolicy.NORMAL) given a set of existing memberIds
    * 
    * @return the set of normal's memberIds
-   * @since 5.8
+   * @since GemFire 5.8
    */
   public Set adviseNormals() {
     return adviseFilter(new Filter() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachePerfStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachePerfStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachePerfStats.java
index ad84963..72a850d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachePerfStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachePerfStats.java
@@ -543,7 +543,7 @@ public class CachePerfStats {
 
   /**
    * Returns the current NanoTime or, if clock stats are disabled, zero.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static long getStatTime() {
     return enableClockStats? NanoTimer.getTime() : 0; 
@@ -844,7 +844,7 @@ public class CachePerfStats {
   
   /**
    * @return the timestamp that marks the start of the operation
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public long startCacheListenerCall() {
     stats.incInt(cacheListenerCallsInProgressId, 1);
@@ -852,7 +852,7 @@ public class CachePerfStats {
   }
   /**
    * @param start the timestamp taken when the operation started 
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void endCacheListenerCall(long start) {
     if (enableClockStats) {
@@ -1101,7 +1101,7 @@ public class CachePerfStats {
    * stats are closed when the {@linkplain GemFireCacheImpl#close cache}
    * is closed.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   void close() {
     this.stats.close();
@@ -1110,7 +1110,7 @@ public class CachePerfStats {
   /**
    * Returns whether or not these stats have been closed
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public boolean isClosed() {
     return this.stats.isClosed();
@@ -1172,7 +1172,7 @@ public class CachePerfStats {
 
   /**
    * Returns the Statistics instance that stores the cache perf stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Statistics getStats() {
     return this.stats;
@@ -1181,7 +1181,7 @@ public class CachePerfStats {
 //   /**
 //    * Returns a helper object so that the event queue can record its
 //    * stats to the proper cache perf stats.
-//    * @since 3.5
+//    * @since GemFire 3.5
 //    */
 //   public ThrottledQueueStatHelper getEventQueueHelper() {
 //     return new ThrottledQueueStatHelper() {
@@ -1205,7 +1205,7 @@ public class CachePerfStats {
   /**
    * Returns a helper object so that the event pool can record its
    * stats to the proper cache perf stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public PoolStatHelper getEventPoolHelper() {
     return new PoolStatHelper() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerAdvisor.java
index 74325e7..01e8210 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerAdvisor.java
@@ -117,7 +117,7 @@ public class CacheServerAdvisor extends GridAdvisor {
      * vm needs to be told about this incoming new cache server. The reply
      * needs to contain any controller(s) that exist in this vm.
      * 
-     * @since 5.7
+     * @since GemFire 5.7
      */
     @Override
     public void processIncoming(DistributionManager dm, String adviseePath,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
index 98603ed..63138b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerImpl.java
@@ -79,7 +79,7 @@ import com.gemstone.gemfire.management.membership.ClientMembershipListener;
  * An implementation of the <code>CacheServer</code> interface that delegates
  * most of the heavy lifting to an {@link Acceptor}.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 @SuppressWarnings("deprecation")
 public class CacheServerImpl
@@ -95,14 +95,14 @@ public class CacheServerImpl
 
   /**
    * The advisor used by this cache server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private volatile CacheServerAdvisor advisor;
 
   /**
    * The monitor used to monitor load on this
    * bridge server and distribute load to the locators
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private volatile LoadMonitor loadMonitor;
 
@@ -118,7 +118,7 @@ public class CacheServerImpl
   
   /**
    * Needed because this guy is an advisee
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private int serialNumber; // changed on each start
 
@@ -398,7 +398,7 @@ public class CacheServerImpl
   /**
    * Gets the address that this bridge server can be contacted on from external
    * processes.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getExternalAddress() {
     return getExternalAddress(true);
@@ -569,7 +569,7 @@ public class CacheServerImpl
    * @param overFlowDir
    * @param isDiskStore
    * @return client subscription name
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static String clientMessagesRegion(GemFireCacheImpl cache, String ePolicy,
       int capacity, int port, String overFlowDir, boolean isDiskStore) {
@@ -688,7 +688,7 @@ public class CacheServerImpl
    * 
    * @param id
    * @return String
-   * @since 5.7 
+   * @since GemFire 5.7
    */
   public static String generateNameForClientMsgsRegion(int id) {
     return ClientSubscriptionConfigImpl.CLIENT_SUBSCRIPTION + "_" + id;
@@ -789,7 +789,7 @@ public class CacheServerImpl
    * @param listener
    *                The <code>InterestRegistrationListener</code> to register
    * @throws IllegalStateException if the BridgeServer has not been started
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void registerInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -807,7 +807,7 @@ public class CacheServerImpl
    *                The <code>InterestRegistrationListener</code> to
    *                unregister
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void unregisterInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -821,7 +821,7 @@ public class CacheServerImpl
    * @return a read-only set of <code>InterestRegistrationListener</code>s
    *         registered with this notifier
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public Set getInterestRegistrationListeners() {
     return getCacheClientNotifier().getInterestRegistrationListeners(); 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index d4c19ce..d13c79f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.util.JavaCommandBuilder;
  * Launcher program to start a cache server.
  *
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class CacheServerLauncher  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializable.java
index 647b20b..472b9ff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializable.java
@@ -45,7 +45,7 @@ public interface CachedDeserializable extends Sizeable
    * Gets a deserialized value for reading.
    * Differs from getDeserializedValue by leaving the value in a form
    * that will optimize future calls.
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Object getDeserializedForReading();
   
@@ -54,7 +54,7 @@ public interface CachedDeserializable extends Sizeable
    * is thrown while converting to a string then the exception
    * will be caught and put in the returned string.
    * @return a string that represents the cached object.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public String getStringForm();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
index 84e44d8..b19d310 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CachedDeserializableFactory.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.pdx.PdxInstance;
 
 /**
  * Produces instances that implement CachedDeserializable.
- * @since 5.0.2
+ * @since GemFire 5.0.2
  *
  */
 public class CachedDeserializableFactory {
@@ -261,7 +261,7 @@ public class CachedDeserializableFactory {
   /**
    * Return how much memory this object will consume
    * if it is in serialized form
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public static int calcSerializedMemSize(Object o) {
     int result = calcSerializedSize(o);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
index 9392ee9..15d02cd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientRegionEventImpl.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
  * host and port for notification purposes.
  * 
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class ClientRegionEventImpl extends RegionEventImpl
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
index f53b262..92578a0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserver.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
  * client/server events.
  * See the documentation for class ClientServerObserverHolder for details.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  *  
  */
 public interface ClientServerObserver

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
index 95b5c4d..6069297 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverAdapter.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
  * interface ClientServerObserver. See the documentation for class
  * ClientServerObserverHolder for details.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class ClientServerObserverAdapter implements ClientServerObserver
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
index efdce27..ec81a2f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ClientServerObserverHolder.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.query.internal.Support;
  * needed, this member variable should point to an object with 'do-nothing'
  * methods, such as ClientServerObserverAdapter.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class ClientServerObserverHolder
   {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
index fc280f1..08cf39d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
@@ -72,7 +72,7 @@ import com.gemstone.gemfire.internal.util.ArrayUtils;
  * of members in the distributed system.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class DistributionAdvisor  {
 
@@ -154,7 +154,7 @@ public class DistributionAdvisor  {
   
   /**
    * the version of the profile set
-   * @since 5.1
+   * @since GemFire 5.1
    */
   private long membershipVersion;
   
@@ -388,7 +388,7 @@ public class DistributionAdvisor  {
 
   /**
    * Free up resources used by this advisor once it is no longer being used.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void close() {
     try {
@@ -482,7 +482,7 @@ public class DistributionAdvisor  {
    * Polls the isInitialized state. Unlike {@link #isInitialized} it will
    * not wait for it to become initialized if it is in the middle of being
    * initialized.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public final boolean pollIsInitialized() {
     return this.initialized;
@@ -542,7 +542,7 @@ public class DistributionAdvisor  {
   /**
    * Return true if the memberId on the specified Profile is a current
    * member of the distributed system.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected boolean isCurrentMember(Profile p) {
     return getDistributionManager().isCurrentMember(p.getDistributedMember());
@@ -721,7 +721,7 @@ public class DistributionAdvisor  {
    * Create a new version of the membership profile set.  This is
    * used in flushing state out of the VM for previous versions of
    * the set.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public synchronized void forceNewMembershipVersion() {
     if (!membershipClosed) {
@@ -746,7 +746,7 @@ public class DistributionAdvisor  {
    * messages for the operation have been put in the DistributionManager's
    * outgoing "queue".
    * @return the current membership version for this advisor
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public final synchronized long startOperation() {
     if (logger.isTraceEnabled(LogMarker.DISTRIBUTION_STATE_FLUSH_OP)) {
@@ -766,7 +766,7 @@ public class DistributionAdvisor  {
    * been put in the DistributionManager's outgoing queue.
    * @param version
    *    The membership version returned by startOperation
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public final synchronized long endOperation(long version) {
     synchronized(this.opCountLock) {
@@ -795,7 +795,7 @@ public class DistributionAdvisor  {
   /**
    * wait for the current operations being sent on views prior to the joining
    * of the given member to be placed on communication channels before returning
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void waitForCurrentOperations(long timeout)
   {
@@ -908,7 +908,7 @@ public class DistributionAdvisor  {
   /**
    * Removes the specified profile if it is registered with this advisor.
    * @return true if it was registered; false if not.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean removeProfile(Profile profile, boolean destroyed) {
     return removeId(profile.getId(), false, destroyed, false/*fromMembershipListener*/);
@@ -1094,7 +1094,7 @@ public class DistributionAdvisor  {
   
 //  /**
 //   * get the profile for a specific member
-//   * @since 5.1
+//   * @since GemFire 5.1
 //   * @return the Profile or null
 //   */
 //  synchronized public Profile getProfile(InternalDistributedMember memberId) {
@@ -1194,7 +1194,7 @@ public class DistributionAdvisor  {
 
   /**
    * Returns a set of the members this advisor should distribute to by default
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @SuppressWarnings("unchecked")
   protected final Set<InternalDistributedMember> getDefaultDistributionMembers() {
@@ -1377,7 +1377,7 @@ public class DistributionAdvisor  {
 
   /** Get an unmodifiable list of the <code>Profile</code>s
    * that match the given <code>Filter</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected List/*<Profile>*/ fetchProfiles(Filter f) {
     initializationGate();
@@ -1407,7 +1407,7 @@ public class DistributionAdvisor  {
 
   /**
    * Provide recipients for profile remove.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set adviseProfileRemove() {
     return adviseGeneric();
@@ -1530,7 +1530,7 @@ public class DistributionAdvisor  {
     /**
      * The DistributionAdvisor's membership version where this member
      * was added
-     * @since 5.1
+     * @since GemFire 5.1
      */
     public transient long initialMembershipVersion;
 
@@ -1548,7 +1548,7 @@ public class DistributionAdvisor  {
 
     /**
      * Return object that uniquely identifies this profile.
-     * @since 5.7
+     * @since GemFire 5.7
      */
     public ProfileId getId() {
       return this.peerMemberId;
@@ -1575,7 +1575,7 @@ public class DistributionAdvisor  {
     }
 
     /** Return the DistributedMember associated with this profile
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public final InternalDistributedMember getDistributedMember() {
       return this.peerMemberId;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionChannel.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionChannel.java
index a31c92f..e96753f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionChannel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionChannel.java
@@ -127,7 +127,7 @@ public class DistributionChannel  {
    * the port of the JavaGroups channel's {@link InternalDistributedMember address} is
    * returned.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public long getId() {
     MembershipManager mgr = this.membershipManager;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 2dbb5c9..f35ce8c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
  * @see com.gemstone.gemfire.internal.Config
  *
  *
- * @since 2.1
+ * @since GemFire 2.1
  */
 public interface DistributionConfig extends Config, LogConfig {
 
@@ -1140,7 +1140,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * com.gemstone.gemfire.i18n.LogWriterI18n} instance to log to.
    *  Set this property with put(), not with setProperty()
    *
-   * @since 4.0 */
+   * @since GemFire 4.0 */
   public static final String LOG_WRITER_NAME = "log-writer";
 
   /** The name of an internal property that specifies a 
@@ -1148,14 +1148,14 @@ public interface DistributionConfig extends Config, LogConfig {
    *  in to a ds connect.
    *  Set this property with put(), not with setProperty()
    *
-   * @since 7.0 */
+   * @since GemFire 7.0 */
   public static final String DS_CONFIG_NAME = "ds-config";
   
   /**
    * The name of an internal property that specifies whether
    * the distributed system is reconnecting after a forced-
    * disconnect.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String DS_RECONNECTING_NAME = "ds-reconnecting";
   
@@ -1172,7 +1172,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * com.gemstone.gemfire.LogWriter} instance to log security messages to. Set
    * this property with put(), not with setProperty()
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static final String SECURITY_LOG_WRITER_NAME = "security-log-writer";
 
@@ -1182,7 +1182,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * FileOutputStream will be closed when the distributed
    * system disconnects.  Set this property with put(), not
    * with setProperty()
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
 
@@ -1192,7 +1192,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property is set, the FileOutputStream will be closed when the distributed
    * system disconnects. Set this property with put(), not with setProperty()
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static final String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
 
@@ -1844,18 +1844,18 @@ public interface DistributionConfig extends Config, LogConfig {
   /** The name of the "asyncMaxQueueSize" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_MAX_QUEUE_SIZE, max=MAX_ASYNC_MAX_QUEUE_SIZE)
   public static final String ASYNC_MAX_QUEUE_SIZE_NAME = "async-max-queue-size";
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   @ConfigAttribute(type=String.class)
   public static final String CLIENT_CONFLATION_PROP_NAME = "conflate-events";
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final String CLIENT_CONFLATION_PROP_VALUE_DEFAULT = "server";
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final String CLIENT_CONFLATION_PROP_VALUE_ON = "true";
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final String CLIENT_CONFLATION_PROP_VALUE_OFF = "false";
   
      
-  /** @since 9.0 */
+  /** @since Geode 1.0 */
   @ConfigAttribute(type=Boolean.class)
   public static final String DISTRIBUTED_TRANSACTIONS_NAME = "distributed-transactions";
   public static final boolean DEFAULT_DISTRIBUTED_TRANSACTIONS = false;
@@ -1870,7 +1870,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#conflate-events">"conflate-events"</a>
    * property.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @ConfigAttributeGetter(name=CLIENT_CONFLATION_PROP_NAME)
   public String getClientConflation();
@@ -1878,7 +1878,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the <a
    * href="../DistributedSystem.html#conflate-events">"conflate-events"</a>
    * property.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @ConfigAttributeSetter(name=CLIENT_CONFLATION_PROP_NAME)
   public void setClientConflation(String clientConflation);
@@ -2272,7 +2272,7 @@ public interface DistributionConfig extends Config, LogConfig {
     * Returns the value of the <a
     * href="../DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a>
     * property.
-    * @since 6.0
+    * @since GemFire 6.0
     */
    @ConfigAttributeGetter(name=REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME)
    public boolean getRemoveUnresponsiveClient();
@@ -2280,12 +2280,12 @@ public interface DistributionConfig extends Config, LogConfig {
     * Sets the value of the <a
     * href="../DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a>
     * property.
-    * @since 6.0
+    * @since GemFire 6.0
     */
    @ConfigAttributeSetter(name=REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME)
    public void setRemoveUnresponsiveClient(boolean value);
 
-   /** @since 6.3 */
+   /** @since GemFire 6.3 */
    @ConfigAttribute(type=Boolean.class)
    public static final String DELTA_PROPAGATION_PROP_NAME = "delta-propagation";
 
@@ -2294,7 +2294,7 @@ public interface DistributionConfig extends Config, LogConfig {
     * Returns the value of the <a
     * href="../DistributedSystem.html#delta-propagation">"delta-propagation"</a>
     * property.
-    * @since 6.3
+    * @since GemFire 6.3
     */
    @ConfigAttributeGetter(name=DELTA_PROPAGATION_PROP_NAME)
    public boolean getDeltaPropagation();
@@ -2303,7 +2303,7 @@ public interface DistributionConfig extends Config, LogConfig {
     * Sets the value of the <a
     * href="../DistributedSystem.html#delta-propagation">"delta-propagation"</a>
     * property.
-    * @since 6.3
+    * @since GemFire 6.3
     */
    @ConfigAttributeSetter(name=DELTA_PROPAGATION_PROP_NAME)
    public void setDeltaPropagation(boolean value);
@@ -2311,7 +2311,7 @@ public interface DistributionConfig extends Config, LogConfig {
   public static final int MIN_DISTRIBUTED_SYSTEM_ID = -1;
   public static final int MAX_DISTRIBUTED_SYSTEM_ID = 255;
    /**
-    * @since 6.6
+    * @since GemFire 6.6
     */
    @ConfigAttribute(type=Integer.class)
    public static final String DISTRIBUTED_SYSTEM_ID_NAME = "distributed-system-id";
@@ -2322,7 +2322,7 @@ public interface DistributionConfig extends Config, LogConfig {
    public static final String DEFAULT_REDUNDANCY_ZONE = "";
    
    /**
-    * @since 6.6
+    * @since GemFire 6.6
     */
    @ConfigAttributeSetter(name=DISTRIBUTED_SYSTEM_ID_NAME)
    public void setDistributedSystemId(int distributedSystemId);
@@ -2331,7 +2331,7 @@ public interface DistributionConfig extends Config, LogConfig {
    public void setRedundancyZone(String redundancyZone);
    
    /**
-    * @since 6.6
+    * @since GemFire 6.6
     */
    @ConfigAttributeGetter(name=DISTRIBUTED_SYSTEM_ID_NAME)
    public int getDistributedSystemId();
@@ -2340,23 +2340,23 @@ public interface DistributionConfig extends Config, LogConfig {
    public String getRedundancyZone();
    
    /**
-    * @since 6.6.2
+    * @since GemFire 6.6.2
     */
    public void setSSLProperty(String attName, String attValue);
    
    /**
-    * @since 6.6.2
+    * @since GemFire 6.6.2
     */
    public Properties getSSLProperties();
    
    public Properties getClusterSSLProperties();
 
    /**
-    * @since 8.0
+    * @since GemFire 8.0
     */
    public Properties getJmxSSLProperties();
    /**
-    * @since 6.6
+    * @since GemFire 6.6
     */
    @ConfigAttribute(type=Boolean.class)
    public static final String ENFORCE_UNIQUE_HOST_NAME = "enforce-unique-host";
@@ -2379,7 +2379,7 @@ public interface DistributionConfig extends Config, LogConfig {
     * href="../DistributedSystem.html#name">"groups"</a> property
     * <p> The default value is: {@link #DEFAULT_GROUPS}.
     * @return the value of the property
-    * @since 7.0
+    * @since GemFire 7.0
     */
    @ConfigAttributeGetter(name=GROUPS_NAME)
    public String getGroups();
@@ -2390,20 +2390,20 @@ public interface DistributionConfig extends Config, LogConfig {
     * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
     * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
     *   when writing to the system's configuration file.
-    * @since 7.0
+    * @since GemFire 7.0
     */
    @ConfigAttributeSetter(name=GROUPS_NAME)
    public void setGroups(String value);
 
    /** The name of the "groups" property 
-    * @since 7.0
+    * @since GemFire 7.0
     */
    @ConfigAttribute(type=String.class)
    public static final String GROUPS_NAME = "groups";
    /**
     * The default groups.
     * <p> Actual value of this constant is <code>""</code>.
-    * @since 7.0
+    * @since GemFire 7.0
     */
    public static final String DEFAULT_GROUPS = "";
 
@@ -2492,7 +2492,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a 
    * href="../DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a> 
    * property.
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttributeGetter(name=OFF_HEAP_MEMORY_SIZE_NAME)
   public String getOffHeapMemorySize();
@@ -2500,13 +2500,13 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the <a 
    * href="../DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a> 
    * property.
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttributeSetter(name=OFF_HEAP_MEMORY_SIZE_NAME)
   public void setOffHeapMemorySize(String value);
   /** 
    * The name of the "off-heap-memory-size" property 
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttribute(type=String.class)
   public static final String OFF_HEAP_MEMORY_SIZE_NAME = "off-heap-memory-size";
@@ -2514,7 +2514,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default <a 
    * href="../DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a>
    * value of <code>""</code>. 
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final String DEFAULT_OFF_HEAP_MEMORY_SIZE = "";
 
@@ -2810,7 +2810,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#memcached-port">"memcached-port"</a> property
    * @return the port on which GemFireMemcachedServer should be started
-   * @since 7.0
+   * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name=MEMCACHED_PORT_NAME)
   public int getMemcachedPort();
@@ -2825,7 +2825,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#memcached-protocol">"memcached-protocol"</a> property
    * @return the protocol for GemFireMemcachedServer
-   * @since 7.0
+   * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name=MEMCACHED_PROTOCOL_NAME)
   public String getMemcachedProtocol();
@@ -2840,7 +2840,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#memcached-bind-address">"memcached-bind-address"</a> property
    * @return the bind address for GemFireMemcachedServer
-   * @since 7.0
+   * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name=MEMCACHED_BIND_ADDRESS_NAME)
   public String getMemcachedBindAddress();
@@ -2855,7 +2855,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#redis-port">"redis-port"</a> property
    * @return the port on which GemFireRedisServer should be started
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=REDIS_PORT_NAME)
   public int getRedisPort();
@@ -2870,7 +2870,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#redis-bind-address">"redis-bind-address"</a> property
    * @return the bind address for GemFireRedisServer
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=REDIS_BIND_ADDRESS_NAME)
   public String getRedisBindAddress();
@@ -2885,7 +2885,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#redis-password">"redis-password"</a> property
    * @return the authentication password for GemFireRedisServer
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=REDIS_PASSWORD_NAME)
   public String getRedisPassword();
@@ -2903,7 +2903,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#http-service-port">"http-service-port"</a> property
    * @return the HTTP service port
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=HTTP_SERVICE_PORT_NAME)
   public int getHttpServicePort();
@@ -2911,14 +2911,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the http-service-port for HTTP service.
    * @param value the port number for HTTP service
-   * @since 8.0               
+   * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name=HTTP_SERVICE_PORT_NAME)
   public void setHttpServicePort(int value);
   
   /**
    * The name of the "http-service-port" property
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttribute(type=Integer.class, min=0, max=65535)
   public static String HTTP_SERVICE_PORT_NAME = "http-service-port";
@@ -2926,7 +2926,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the "http-service-port" property.
    * Current value is a <code>7070</code>
-   * @since 8.0 
+   * @since GemFire 8.0
    */
   public static int DEFAULT_HTTP_SERVICE_PORT = 7070;
   
@@ -2934,7 +2934,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#http-service-bind-address">"http-service-bind-address"</a> property
    * @return the bind-address for HTTP service
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=HTTP_SERVICE_BIND_ADDRESS_NAME)
   public String getHttpServiceBindAddress();
@@ -2942,14 +2942,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the http-service-bind-address for HTTP service.
    * @param value the bind-address for HTTP service
-   * @since 8.0               
+   * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name=HTTP_SERVICE_BIND_ADDRESS_NAME)
   public void setHttpServiceBindAddress(String value);
   
   /** 
    * The name of the "http-service-bind-address" property
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttribute(type=String.class)
   public static String HTTP_SERVICE_BIND_ADDRESS_NAME = "http-service-bind-address";
@@ -2957,7 +2957,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the "http-service-bind-address" property.
    * Current value is an empty string <code>""</code>
-   * @since 8.0 
+   * @since GemFire 8.0
    */
   public static String DEFAULT_HTTP_SERVICE_BIND_ADDRESS = "";
   
@@ -3194,7 +3194,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the <a
    * href="../DistributedSystem.html#start-dev-rest-api">"start-dev-rest-api"</a> property
    * @return the value of the property
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name=START_DEV_REST_API_NAME)
   public boolean getStartDevRestApi();
@@ -3202,14 +3202,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the start-dev-rest-api for HTTP service.
    * @param value for the property
-   * @since 8.0               
+   * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name=START_DEV_REST_API_NAME)
   public void setStartDevRestApi(boolean value);
   
   /** 
    * The name of the "start-dev-rest-api" property
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttribute(type=Boolean.class)
   public static String START_DEV_REST_API_NAME = "start-dev-rest-api";
@@ -3217,13 +3217,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the "start-dev-rest-api" property.
    * Current value is <code>"false"</code>
-   * @since 8.0 
+   * @since GemFire 8.0
    */
   public static boolean DEFAULT_START_DEV_REST_API = false;
   
   /**
    * The name of the "default-auto-reconnect" property
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @ConfigAttribute(type=Boolean.class)
   public static final String DISABLE_AUTO_RECONNECT_NAME = "disable-auto-reconnect";
@@ -3724,21 +3724,21 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The name of the "lock-memory" property.  Used to cause pages to be locked
    * into memory, thereby preventing them from being swapped to disk.
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttribute(type=Boolean.class)
   public static String LOCK_MEMORY_NAME = "lock-memory";
   public static final boolean DEFAULT_LOCK_MEMORY = false;
   /**
    * Gets the value of <a href="../DistributedSystem.html#lock-memory">"lock-memory"</a>
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttributeGetter(name=LOCK_MEMORY_NAME)
   public boolean getLockMemory();
   /**
    * Set the value of <a href="../DistributedSystem.html#lock-memory">"lock-memory"</a>
    * @param value the new setting
-   * @since 9.0
+   * @since Geode 1.0
    */
   @ConfigAttributeSetter(name=LOCK_MEMORY_NAME)
   public void setLockMemory(boolean value);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 8b6b632..64f7cc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
  * @see InternalDistributedSystem
  *
  *
- * @since 2.1
+ * @since GemFire 2.1
  */
 public class DistributionConfigImpl
   extends AbstractDistributionConfig
@@ -196,7 +196,7 @@ public class DistributionConfigImpl
   protected int asyncQueueTimeout = DEFAULT_ASYNC_QUEUE_TIMEOUT;
   protected int asyncMaxQueueSize = DEFAULT_ASYNC_MAX_QUEUE_SIZE;
 
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   private String clientConflation = CLIENT_CONFLATION_PROP_VALUE_DEFAULT;
 
   /** The id of the durable client */
@@ -623,7 +623,7 @@ public class DistributionConfigImpl
    *          whether to skip loading distributed system properties from
    *          gemfire.properties file
    *          
-   * @since 6.5
+   * @since GemFire 6.5
    */
   
   public DistributionConfigImpl(Properties nonDefault, 
@@ -647,7 +647,7 @@ public class DistributionConfigImpl
    *          properties to other ssl properties. This parameter will be used
    *          till we provide support for ssl-* properties.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public DistributionConfigImpl(Properties nonDefault, 
                                 boolean ignoreGemFirePropsFile, boolean isConnected) {
@@ -1874,12 +1874,12 @@ public class DistributionConfigImpl
     memberTimeout = (Integer)checkAttribute(MEMBER_TIMEOUT_NAME, value);
   }
 
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public String getClientConflation() {
     return this.clientConflation;
   }
 
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public void setClientConflation(String value) {
     this.clientConflation = (String)checkAttribute(CLIENT_CONFLATION_PROP_NAME, value);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index b0bc82a..3f002cd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@ -123,7 +123,7 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock;
  * So, we refactored the code of those two subclasses into
  * <code>DistributionManager</code>.
  *
- * @since 2.0
+ * @since GemFire 2.0
  *
  * @see DistributionMessage#process
  * @see IgnoredByManager
@@ -215,7 +215,7 @@ public class DistributionManager
   public static final int NORMAL_DM_TYPE = 10;
 
   /** The DM type for locator distribution managers 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static final int LOCATOR_DM_TYPE = 11;
 
@@ -289,7 +289,7 @@ public class DistributionManager
    * JMX agent)?  If so, then it creates {@link #ADMIN_ONLY_DM_TYPE}
    * type distribution managers.
    *
-   * @since 4.0 
+   * @since GemFire 4.0
    */
   public static volatile boolean isDedicatedAdminVM = false;
   
@@ -321,12 +321,12 @@ public class DistributionManager
     new MembershipListenersLock();
   /** The <code>MembershipListener</code>s that are registered on this
    * manager for ALL members.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected volatile Set allMembershipListeners = Collections.EMPTY_SET;
   /**
    * A lock to hold while adding and removing all membership listeners.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected final Object allMembershipListenersLock =
     new MembershipListenersLock();
@@ -1626,7 +1626,7 @@ public class DistributionManager
    * hosted locators. The value is a collection of host[port] strings. If a 
    * bind-address was used for a locator then the form is bind-addr[port].
    *
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public void addHostedLocators(InternalDistributedMember member, Collection<String> locators, boolean isSharedConfigurationEnabled) {
     synchronized (this.membersLock) {
@@ -1700,7 +1700,7 @@ public class DistributionManager
    * hosted locators. The value is a collection of host[port] strings. If a 
    * bind-address was used for a locator then the form is bind-addr[port].
    * 
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public Collection<String> getHostedLocators(InternalDistributedMember member) {
     synchronized (this.membersLock) {
@@ -1713,7 +1713,7 @@ public class DistributionManager
    * member, and the value is a collection of host[port] strings. If a 
    * bind-address was used for a locator then the form is bind-addr[port].
    * 
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public Map<InternalDistributedMember, Collection<String>> getAllHostedLocators() {
     synchronized (this.membersLock) {
@@ -1725,7 +1725,7 @@ public class DistributionManager
    * member, and the value is a collection of host[port] strings. If a 
    * bind-address was used for a locator then the form is bind-addr[port].
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @Override
   public Map<InternalDistributedMember, Collection<String>> getAllHostedLocatorsWithSharedConfiguration() {
@@ -1750,7 +1750,7 @@ public class DistributionManager
    * Returns the low-level distribution channel for this distribution
    * manager. (brought over from ConsoleDistributionManager)
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public DistributionChannel getDistributionChannel() {
     return this.channel;
@@ -1838,7 +1838,7 @@ public class DistributionManager
    * Returns the id of the underlying distribution channel used for
    * communication.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public long getChannelId() {
     return this.channel.getId();
@@ -2318,7 +2318,7 @@ public class DistributionManager
   
   /**
    * Returns the transport configuration for this distribution manager
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public RemoteTransportConfig getTransport() {
     return this.transport;
@@ -2348,7 +2348,7 @@ public class DistributionManager
   /**
    * Adds a <code>MembershipListener</code> to this distribution
    * manager.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void addAllMembershipListener(MembershipListener l) {
     synchronized (this.allMembershipListenersLock) {
@@ -2366,7 +2366,7 @@ public class DistributionManager
    * @throws IllegalArgumentException
    *         <code>l</code> was not registered on this distribution
    *         manager
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void removeAllMembershipListener(MembershipListener l) {
     synchronized (this.allMembershipListenersLock) {
@@ -2575,7 +2575,7 @@ public class DistributionManager
 //    * Initializes and returns a <code>DistributedSystem</code> to be
 //    * sent to new members of the distributed system.
 //    *
-//    * @since 3.0
+//    * @since GemFire 3.0
 //    */
 //   protected DistributedState getNewDistributedState() {
 //     DistributedState state = new DistributedState();
@@ -2618,7 +2618,7 @@ public class DistributionManager
   /**
    * Add a membership listener for all members
    * and return other DistribtionManagerIds as an atomic operation
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set addAllMembershipListenerAndGetAllIds(MembershipListener l) {
     // TO fix this deadlock:
@@ -3897,7 +3897,7 @@ public class DistributionManager
    * Sets the administration agent associated with this distribution
    * manager.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setAgent(RemoteGfManagerAgent agent) {
     // Don't let the agent be set twice.  There should be a one-to-one
@@ -3918,7 +3918,7 @@ public class DistributionManager
   /**
    * Returns the agent that owns this distribution manager.
    * (in ConsoleDistributionManager)
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public RemoteGfManagerAgent getAgent(){
     return this.agent;
@@ -3931,7 +3931,7 @@ public class DistributionManager
    * @return <code>null</code> if no admin {@linkplain #getAgent
    *         agent} is associated with this distribution manager
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public String getDistributionConfigDescription() {
     if (this.agent == null) {
@@ -3971,7 +3971,7 @@ public class DistributionManager
    * @param owner the agent that owns the returned monitor
    * @return the health monitor created by the owner; <code>null</code>
    *    if the owner has now created a monitor.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public HealthMonitor getHealthMonitor(InternalDistributedMember owner) {
     return (HealthMonitor)this.hmMap.get(owner);
@@ -3981,7 +3981,7 @@ public class DistributionManager
    *
    * @param owner the agent that owns the created monitor
    * @param cfg the configuration to use when creating the monitor
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void createHealthMonitor(InternalDistributedMember owner,
                                   GemFireHealthConfig cfg) {
@@ -4652,7 +4652,7 @@ public class DistributionManager
 
   /* (non-Javadoc)
    * @see com.gemstone.gemfire.distributed.internal.DM#getMembersOnThisHost()
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public Set<InternalDistributedMember> getMembersInThisZone() {
     return getMembersInSameZone(getDistributionManagerId());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
index bb36b80..3a64d06 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionMessage.java
@@ -180,7 +180,7 @@ public abstract class DistributionMessage
   /**
    * If true then this message most be sent on an ordered channel.
    * If false then it can be unordered.
-   * @since 5.5 
+   * @since GemFire 5.5
    */
   public boolean orderedDelivery() {
     final int processorType = getProcessorType();
@@ -216,14 +216,14 @@ public abstract class DistributionMessage
 
   /**
    * Causes this message to be send using multicast if v is true.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setMulticast(boolean v) {
     this.multicast = v;
   }
   /**
    * Return true if this message should be sent using multicast.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public boolean getMulticast() {
     return this.multicast;
@@ -643,7 +643,7 @@ public abstract class DistributionMessage
    * 
    * @return null if message is not conflatable. Otherwise return
    * a key that can be used to identify the entry to conflate.
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public ConflationKey getConflationKey() {
     return null; // by default conflate nothing; override in subclasses
@@ -651,7 +651,7 @@ public abstract class DistributionMessage
 
   /**
    * @return the ID of the reply processor for this message, or zero if none
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getProcessorId() {
     return 0;
@@ -673,7 +673,7 @@ public abstract class DistributionMessage
    * Returns true if the message is for internal-use such as a meta-data region.
    * 
    * @return true if the message is for internal-use such as a meta-data region
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public boolean isInternal() {
     return false;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionStats.java
index 75c77ad..c4803ab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionStats.java
@@ -776,7 +776,7 @@ public class DistributionStats implements DMStats {
 
   /**
    * Returns the current NanoTime or, if clock stats are disabled, zero.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static long getStatTime() {
     return enableClockStats? NanoTimer.getTime() : 0;
@@ -1477,7 +1477,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the overflow queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public ThrottledQueueStatHelper getOverflowQueueHelper() {
     return new ThrottledQueueStatHelper() {
@@ -1502,7 +1502,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the waiting queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public QueueStatHelper getWaitingQueueHelper() {
     return new QueueStatHelper() {
@@ -1521,7 +1521,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the high priority queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public ThrottledQueueStatHelper getHighPriorityQueueHelper() {
     return new ThrottledQueueStatHelper() {
@@ -1546,7 +1546,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the partitioned region queue can record its
    * stats to the proper distribution stats.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public ThrottledQueueStatHelper getPartitionedRegionQueueHelper() {
     return new ThrottledQueueStatHelper() {
@@ -1570,7 +1570,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the partitioned region pool can record its
    * stats to the proper distribution stats.
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public PoolStatHelper getPartitionedRegionPoolHelper() {
     return new PoolStatHelper() {
@@ -1586,7 +1586,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the function execution queue can record its
    * stats to the proper distribution stats.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ThrottledQueueStatHelper getFunctionExecutionQueueHelper() {
     return new ThrottledQueueStatHelper() {
@@ -1610,7 +1610,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the function execution pool can record its
    * stats to the proper distribution stats.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public PoolStatHelper getFunctionExecutionPoolHelper() {
     return new PoolStatHelper() {
@@ -1626,7 +1626,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the serial queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public ThrottledMemQueueStatHelper getSerialQueueHelper() {
     return new ThrottledMemQueueStatHelper() {
@@ -1657,7 +1657,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the normal pool can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public PoolStatHelper getNormalPoolHelper() {
     return new PoolStatHelper() {
@@ -1673,7 +1673,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the waiting pool can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public PoolStatHelper getWaitingPoolHelper() {
     return new PoolStatHelper() {
@@ -1689,7 +1689,7 @@ public class DistributionStats implements DMStats {
   /**
    * Returns a helper object so that the highPriority pool can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public PoolStatHelper getHighPriorityPoolHelper() {
     return new PoolStatHelper() {
@@ -1745,7 +1745,7 @@ public class DistributionStats implements DMStats {
   }
 
   /**
-   * @since 5.0.2.4
+   * @since GemFire 5.0.2.4
    */
   public void incReceiverBufferSize(int inc, boolean direct) {
     if (direct) {
@@ -1755,7 +1755,7 @@ public class DistributionStats implements DMStats {
     }
   }
   /**
-   * @since 5.0.2.4
+   * @since GemFire 5.0.2.4
    */
   public void incSenderBufferSize(int inc, boolean direct) {
     if (direct) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FlowControlParams.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FlowControlParams.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FlowControlParams.java
index 3d9d8c2..b656805 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FlowControlParams.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/FlowControlParams.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.distributed.internal;
     <p>
     The byteAllowance and rechargeBlockMs settings are used in hashcode calculations,
     and should not be changed if the hashcode of a FlowControlParams needs to remain invariant.
-    @since 5.0
+    @since GemFire 5.0
 */
 
 public class FlowControlParams implements java.io.Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitor.java
index 2ef5b9f..92cafe8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitor.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.admin.GemFireHealth;
 
 /**
  * Represents a thread that monitor the health of the vm it lives in.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface HealthMonitor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitorImpl.java
index 38692dc..7862390 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HealthMonitorImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Implements a thread that monitors the health of the vm it lives in.
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class HealthMonitorImpl implements HealthMonitor, Runnable {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HighPriorityAckedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HighPriorityAckedMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HighPriorityAckedMessage.java
index c5590d1..ffae0fe 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HighPriorityAckedMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/HighPriorityAckedMessage.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * messages have been received and applied to the cache.  Their reply messages
  * may not necessarily have been sent back or processed (if they have any).
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class HighPriorityAckedMessage extends HighPriorityDistributionMessage implements MessageWithReply {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 552dbe3..76a49db 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -114,7 +114,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * The concrete implementation of {@link DistributedSystem} that
  * provides internal-only functionality.
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public class InternalDistributedSystem
@@ -306,7 +306,7 @@ public class InternalDistributedSystem
    * for administration.  For administration, we are not as strict
    * when it comes to existing connections.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static DistributedSystem connectForAdmin(Properties props) {
     return DistributedSystem.connectForAdmin(props);
@@ -318,7 +318,7 @@ public class InternalDistributedSystem
    * This method synchronizes on the existingSystems collection.
    *
    * <p>author bruce
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static InternalDistributedSystem getConnectedInstance() {
     InternalDistributedSystem result = null;
@@ -337,7 +337,7 @@ public class InternalDistributedSystem
    * Returns the current distributed system, if there is one.
    * Note: this method is no longer unsafe size existingSystems uses copy-on-write.
    * <p>author bruce
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static InternalDistributedSystem unsafeGetConnectedInstance() {
     InternalDistributedSystem result = getAnyInstance();
@@ -729,7 +729,7 @@ public class InternalDistributedSystem
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void startInitLocator() throws InterruptedException {
     String locatorString = this.originalConfig.getStartLocator();
@@ -777,7 +777,7 @@ public class InternalDistributedSystem
   }
   
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void endInitLocator() throws IOException {
     InternalLocator loc = this.startedLocator;
@@ -1473,7 +1473,7 @@ public class InternalDistributedSystem
    * to the same distributed system as this
    * <code>InternalDistributedSystem</code> connection.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean sameSystemAs(Properties props) {
     DistributionConfig other = DistributionConfigImpl.produce(props);
@@ -1504,7 +1504,7 @@ public class InternalDistributedSystem
   /**
    * Canonicalizes a locators string so that they may be compared.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private static String canonicalizeLocators(String locators) {
     SortedSet sorted = new TreeSet();
@@ -2264,7 +2264,7 @@ public class InternalDistributedSystem
    * Fires an "informational" <code>SystemMembershipEvent</code> in
    * admin VMs.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void fireInfoEvent(Object callback) {
     throw new UnsupportedOperationException(LocalizedStrings.InternalDistributedSystem_NOT_IMPLEMENTED_YET.toLocalizedString());
@@ -2973,7 +2973,7 @@ public class InternalDistributedSystem
 
   /**
    * see {@link com.gemstone.gemfire.admin.AdminDistributedSystemFactory}
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void setEnableAdministrationOnly(boolean adminOnly) {
     DistributedSystem.setEnableAdministrationOnly(adminOnly);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index cf8d91e..9d8e58c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -104,7 +104,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
  * locator.startPeerLocation();
  * locator.startDistributeSystem();
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class InternalLocator extends Locator implements ConnectListener {
 
@@ -131,7 +131,7 @@ public class InternalLocator extends Locator implements ConnectListener {
   private final TcpServer server;
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private final PrimaryHandler handler;
   
@@ -308,7 +308,7 @@ public class InternalLocator extends Locator implements ConnectListener {
    * @param loadSharedConfigFromDir 
    *    load the shared configuration from the shared configuration directory
    * @throws IOException 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static InternalLocator startLocator(
       int port,
@@ -633,7 +633,7 @@ public class InternalLocator extends Locator implements ConnectListener {
    * 
    * @param withDS true if a distributed system has been or will be started
    * @throws IOException
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void startPeerLocation(boolean withDS) throws IOException {
     if(isPeerLocator()) {
@@ -708,7 +708,7 @@ public class InternalLocator extends Locator implements ConnectListener {
    * distributed system already exists, this method will have no affect.
    * 
    * @throws UnknownHostException
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void startDistributedSystem() throws UnknownHostException {
     InternalDistributedSystem existing = InternalDistributedSystem.getConnectedInstance();
@@ -822,7 +822,7 @@ public class InternalLocator extends Locator implements ConnectListener {
    * @param distributedSystem
    *                The distributed system to use for the statistics.
    *                
-   * @since 5.7
+   * @since GemFire 5.7
    * 
    * @throws UnknownHostException
    */
@@ -851,7 +851,7 @@ public class InternalLocator extends Locator implements ConnectListener {
    *                The distributed system which the server location services
    *                should use. If null, the method will try to find an already
    *                connected distributed system.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void startServerLocation(InternalDistributedSystem distributedSystem)
     throws IOException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorLoadSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorLoadSnapshot.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorLoadSnapshot.java
index f563c13..c6a4325 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorLoadSnapshot.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorLoadSnapshot.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 /**
  * A data structure used to hold load information for a locator
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public class LocatorLoadSnapshot {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
index 1140b1f..6cad358 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 
 /**
  * This class maintains statistics for the locator
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class LocatorStats {
   private static StatisticsType type;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java
index 54675c9..3920267 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LonerDistributionManager.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
  *
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class LonerDistributionManager implements DM {
   private final InternalDistributedSystem system;
@@ -911,7 +911,7 @@ public class LonerDistributionManager implements DM {
 
   /* (non-Javadoc)
    * @see com.gemstone.gemfire.distributed.internal.DM#getMembersOnThisHost()
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public Set<InternalDistributedMember> getMembersInThisZone() {
     return this.allIds;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/MessageWithReply.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/MessageWithReply.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/MessageWithReply.java
index d83dc15..a5c028c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/MessageWithReply.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/MessageWithReply.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
  * be sent asynchronously through the transport layer.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface MessageWithReply {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PoolStatHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PoolStatHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PoolStatHelper.java
index 130b6df..f4b8f83 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PoolStatHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/PoolStatHelper.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.distributed.internal;
  * The implementation will call these methods at to proper time.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface PoolStatHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ProductUseLog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ProductUseLog.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ProductUseLog.java
index 043ddc1..c8e066d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ProductUseLog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ProductUseLog.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.logging.PureLogWriter;
  * default and can be adjusted with the system property <b>gemfire.max_product_use_file_size</b>,
  * though the size is not allowed to be less than 1mb.
  * 
- * @since 2013
+ * @since GemFire 2013
  */
 public final class ProductUseLog implements MembershipListener {
   protected static long MAX_PRODUCT_USE_FILE_SIZE = Long.getLong("max_view_log_size", 5000000); 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/QueueStatHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/QueueStatHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/QueueStatHelper.java
index 32b9467..dd1837f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/QueueStatHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/QueueStatHelper.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.distributed.internal;
  * The implementation will call these methods at to proper time.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface QueueStatHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReliableReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReliableReplyProcessor21.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReliableReplyProcessor21.java
index 42953a4..93f89a3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReliableReplyProcessor21.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReliableReplyProcessor21.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * This is a reply processor which tracks departed members in order for
  * reliable messaging to determine which recipients departed before replying.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class ReliableReplyProcessor21 extends ReplyProcessor21 {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyException.java
index 322cae5..646243a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyException.java
@@ -98,7 +98,7 @@ public class ReplyException extends GemFireException {
    * local stack frames. The remote stack elements have the sender id info. 
    * 
    * @param t Remote exception to fix up
-   * @since 5.1
+   * @since GemFire 5.1
    */
   private void fixUpRemoteEx(Throwable t) {
     if (getSender() == null) {
@@ -174,7 +174,7 @@ public class ReplyException extends GemFireException {
   /**
    * Sets the member that threw the received exception
    * @param sendr the member that threw the exception
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public synchronized void setSenderIfNull(InternalDistributedMember sendr) {
     if (this.sender == null) {
@@ -185,7 +185,7 @@ public class ReplyException extends GemFireException {
   /**
    * Gets the member which threw the exception
    * @return the throwing member
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public synchronized InternalDistributedMember getSender() {
     return this.sender;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
index e5e8cbf..5705689 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
@@ -79,7 +79,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * @see MessageWithReply
  *
  *
- * @since 2.1
+ * @since GemFire 2.1
  */
 public class ReplyProcessor21
     implements MembershipListener {
@@ -551,7 +551,7 @@ public class ReplyProcessor21
    * Registers this processor as a membership listener and
    * returns a set of the current members.
    * @return a Set of the current members
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected Set addListenerAndGetMembers() {
     return getDistributionManager()
@@ -559,7 +559,7 @@ public class ReplyProcessor21
   }
   /**
    * Unregisters this processor as a membership listener
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void removeListener() {
     try {
@@ -572,7 +572,7 @@ public class ReplyProcessor21
   /**
    * Returns the set of members that this processor should care about.
    * @return a Set of the current members
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected Set getDistributionManagerIds() {
     return getDistributionManager().getDistributionManagerIds();
@@ -868,7 +868,7 @@ public class ReplyProcessor21
   /**
    * Used to cleanup resources allocated by the processor
    * after we are done using it.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void cleanup() {
     if (!this.keeperCleanedUp) {
@@ -950,7 +950,7 @@ public class ReplyProcessor21
 
   /**
    * Control of reply processor waiting behavior in the face of exceptions.
-   * @since 5.7
+   * @since GemFire 5.7
    * @return true to stop waiting when exceptions are present
    */
   protected boolean stopBecauseOfExceptions() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
index 31ee698..010527f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -36,7 +36,7 @@ import java.util.List;
  * set the attSourceMap to the correct source after these methods return.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public final class RuntimeDistributionConfigImpl
   extends DistributionConfigImpl  {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
index b37a50b..f5b774f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ServerLocator.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerLocator implements TcpHandler, DistributionAdvisee {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index ba9c7dc..ccccee3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -881,7 +881,7 @@ public class SharedConfiguration {
    *
    * @param xmlContent XML content to load and upgrade.
    * @return {@link Document} from xmlContent.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   // UnitTest SharedConfigurationJUnitTest.testCreateAndUpgradeDocumentFromXml
   static Document createAndUpgradeDocumentFromXml(final String xmlContent) throws SAXException, ParserConfigurationException, IOException, XPathExpressionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/Sizeable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/Sizeable.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/Sizeable.java
index 7a65374..76deee0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/Sizeable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/Sizeable.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.distributed.internal;
 
 /** Sizeable objects have a getSize() method that returns the approximate size of the object.
 
-    @since 5.0
+    @since GemFire 5.0
  */
 
 public interface Sizeable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SizeableRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SizeableRunnable.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SizeableRunnable.java
index 57a33bc..e6896e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SizeableRunnable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SizeableRunnable.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.distributed.internal;
     Instances/subclasses must provide the run() method to complete the
     Runnable interface.<p>
     
-    @since 5.0
+    @since GemFire 5.0
  */
 
 public abstract class SizeableRunnable implements Runnable, Sizeable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java
index 6f5feb7..6df3dfe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java
@@ -65,7 +65,7 @@ public final class StartupMessage extends HighPriorityDistributionMessage implem
    * will be regarded as an error by all who see it.
    * 
    * @return list of addresses for this host
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static Set getMyAddresses(DistributionManager dm) {
     try {
@@ -107,7 +107,7 @@ public final class StartupMessage extends HighPriorityDistributionMessage implem
   
   /**
    * Sets the mcastEnabled flag for this message
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void setMcastEnabled(boolean flag) {
     isMcastEnabled = flag;
@@ -142,7 +142,7 @@ public final class StartupMessage extends HighPriorityDistributionMessage implem
   
   /**
    * Sets the tcpDisabled flag for this message
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void setTcpDisabled(boolean flag) {
     isTcpDisabled = flag;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
index 060ba76..ad61b88 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.GemFireVersion;
  * backwards compatibility. All new fields added should be written to allow
  * for version compatibility.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 class StartupMessageData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage.java
index 26a7f54..3027486 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class StartupResponseWithVersionMessage extends StartupResponseMessage {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledMemQueueStatHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledMemQueueStatHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledMemQueueStatHelper.java
index a59a299..ee4cd91 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledMemQueueStatHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledMemQueueStatHelper.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.distributed.internal;
  * The implementation will call these methods at to proper time.
  *
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface ThrottledMemQueueStatHelper extends QueueStatHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledQueueStatHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledQueueStatHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledQueueStatHelper.java
index 03698b8..e7244c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledQueueStatHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottledQueueStatHelper.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.distributed.internal;
  * The implementation will call these methods at to proper time.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public interface ThrottledQueueStatHelper extends QueueStatHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
index 7423bb9..0db7267 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ThrottlingMemLinkedQueueWithDMStats.java
@@ -35,7 +35,7 @@ import java.util.*;
  * Inserting other types of objects will cause class cast exceptions to be thrown
  * on put/take.
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
index 9fe5260..ac41d1c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
@@ -663,7 +663,7 @@ public class DirectChannel {
   
   /**
    * Returns null if no config is available.
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public DistributionConfig getDMConfig() {
     DM dm = getDM();
@@ -827,7 +827,7 @@ public class DirectChannel {
   /**
    * Returns the conduit over which this channel sends messages
    *
-   * @since 2.1
+   * @since GemFire 2.1
    */
   public TCPConduit getConduit() {
     return this.conduit;
@@ -877,7 +877,7 @@ public class DirectChannel {
    *    the member whose state is to be captured
    * @param result
    *    the map to add the state to
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void getChannelStates(DistributedMember member, Map result)
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
index 844a93d..c0c97ff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
@@ -2496,7 +2496,7 @@ public class DLockService extends DistributedLockService {
     
   /**
    * Destroys an existing service and removes it from the map
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void destroyAndRemove() {
     // isLockGrantor determines if we need to tell elder of destroy
@@ -3179,7 +3179,7 @@ public class DLockService extends DistributedLockService {
   
   /**
    * Return a timestamp that represents the current time for locking purposes.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static long getLockTimeStamp(DM dm) {
     return dm.cacheTimeMillis();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockStats.java
index ebdc83e..9a61c10 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockStats.java
@@ -827,7 +827,7 @@ public class DLockStats implements DistributedLockStats {
   /**
    * Returns a helper object so that the serial queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public QueueStatHelper getSerialQueueHelper() {
     return new QueueStatHelper() {
@@ -846,7 +846,7 @@ public class DLockStats implements DistributedLockStats {
   /**
    * Returns a helper object so that the waiting pool can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public PoolStatHelper getWaitingPoolHelper() {
     return new PoolStatHelper() {
@@ -862,7 +862,7 @@ public class DLockStats implements DistributedLockStats {
   /**
    * Returns a helper object so that the waiting queue can record its
    * stats to the proper distribution stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public QueueStatHelper getWaitingQueueHelper() {
     return new QueueStatHelper() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DeposeGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DeposeGrantorProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DeposeGrantorProcessor.java
index e951176..08d459b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DeposeGrantorProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DeposeGrantorProcessor.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * A processor for telling the old grantor that he is deposed by a new grantor. 
  * Processor waits for ack before completing.
  *
- * @since 4.0
+ * @since GemFire 4.0
  * (renamed from ExpectTransferProcessor)
  */
 public class DeposeGrantorProcessor extends ReplyProcessor21 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DistributedMemberLock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DistributedMemberLock.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DistributedMemberLock.java
index cacf9b9..9655bda 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DistributedMemberLock.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DistributedMemberLock.java
@@ -42,7 +42,7 @@ import java.util.concurrent.locks.Lock;
  * com.gemstone.gemfire.distributed.DistributedLockService} and may throw
  * LockNotHeldException or LockServiceDestroyedException.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class DistributedMemberLock implements Lock {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderInitProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderInitProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderInitProcessor.java
index e799f79..5d2833d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderInitProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderInitProcessor.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * A processor for initializing the ElderState. This may involve sending
  * a message to every existing member to discover what services they have.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ElderInitProcessor extends ReplyProcessor21 {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderState.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderState.java
index 245bc60..8b1d631 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/ElderState.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 /**
  * Keeps track of all the information kept by the elder.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ElderState {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorInfo.java
index f3cc947..664921b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorInfo.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
 /**
  * Used to provide information on a grantor request made to the elder.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class GrantorInfo {
   private final InternalDistributedMember id;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorRequestProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorRequestProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorRequestProcessor.java
index 6b64616..ec5cd96 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorRequestProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/GrantorRequestProcessor.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock;
  * A processor for sending a message to the elder asking it for the
  * grantor of a dlock service.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class GrantorRequestProcessor extends ReplyProcessor21 {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorDestroyedException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorDestroyedException.java
index f0843d0..aede763 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorDestroyedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorDestroyedException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.distributed.internal.locks;
  * A <code>LockGrantorDestroyedException</code> is thrown when attempting
  * use a distributed lock grantor that has been destroyed.
  *
- * @since     4.0
+ * @since GemFire     4.0
  */
 public class LockGrantorDestroyedException extends IllegalStateException {
 private static final long serialVersionUID = -3540124531032570817L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java
index b0a438b..49fdd07 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/LockGrantorId.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /**
  * Identifies specific lock grantor member and version.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class LockGrantorId {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java
index d3941bc..7a2b356 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamer.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * in chunks. This allows us to send a message without needing to
  * perserialize it completely in memory thus saving buffer memory.
 
-    @since 5.0.2
+    @since GemFire 5.0.2
    
     */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamerList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamerList.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamerList.java
index 419db2d..b463f44 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamerList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgStreamerList.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * requiring possibly different serializations for different versions of
  * product.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public final class MsgStreamerList implements BaseMsgStreamer {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ServerDelegate.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ServerDelegate.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ServerDelegate.java
index 67f0ba8..2bb8a71 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ServerDelegate.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ServerDelegate.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
 
     @see com.gemstone.gemfire.distributed.internal.direct.DirectChannel
 
-    @since 2.0
+    @since GemFire 2.0
    
   */
 public interface ServerDelegate {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
index 3ac53d9..ac4c24f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
@@ -76,7 +76,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
     If the ServerDelegate is null, DistributionMessages are ignored by
     the TCPConduit.</p>
 
-    @since 2.0
+    @since GemFire 2.0
    
 */
 
@@ -169,7 +169,7 @@ public class TCPConduit implements Runnable {
 
   /**
    * Config from the delegate
-   * @since 4.2.1
+   * @since GemFire 4.2.1
    */
   DistributionConfig config;
   
@@ -553,7 +553,7 @@ public class TCPConduit implements Runnable {
   /**
    * Returns whether or not this conduit is stopped
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public boolean isStopped() {
     return this.stopped;
@@ -792,7 +792,7 @@ public class TCPConduit implements Runnable {
   /**
    * records the current outgoing message count on all thread-owned
    * ordered connections
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void getThreadOwnedOrderedConnectionState(
     DistributedMember member,
@@ -805,7 +805,7 @@ public class TCPConduit implements Runnable {
    * wait for the incoming connections identified by the keys in the
    * argument to receive and dispatch the number of messages associated
    * with the key
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void waitForThreadOwnedOrderedConnectionState(DistributedMember member, Map channelState)
     throws InterruptedException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream.java
index 60d3ec3..01a0811 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedByteBufferInputStream.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.VersionedDataStream;
  * {@link VersionedDataStream} for a stream coming from a different product
  * version.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public class VersionedByteBufferInputStream extends ByteBufferInputStream
     implements VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedMsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedMsgStreamer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedMsgStreamer.java
index 2d990bb..08ff53a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedMsgStreamer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/VersionedMsgStreamer.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.VersionedDataStream;
  * An extension of {@link MsgStreamer} that implements
  * {@link VersionedDataStream}.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 final class VersionedMsgStreamer extends MsgStreamer implements
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java
index 00884c6..19128aa 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Breadcrumbs.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.EventID;
  * Breadcrumbs establishes traces in thread names that are useful in figuring
  * out what is going on in a distributed system given only stack traces.
  * 
- * @since 20 May 2014
+ * @since GemFire 20 May 2014
  *
  */
 public class Breadcrumbs {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/CollectionUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/CollectionUtils.java
index bbc6b1d..d767649 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/CollectionUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/CollectionUtils.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.lang.Filter;
  * @see java.util.List
  * @see java.util.Map
  * @see java.util.Set
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class CollectionUtils {
 
@@ -208,7 +208,7 @@ public abstract class CollectionUtils {
    * @param enumeration
    *          to add to collection.
    * @return true if collection is modified, otherwise false.
-   * @since 8.1
+   * @since GemFire 8.1
    * @see Collection#addAll(Collection)
    */
   public static final <T> boolean addAll(final Collection<T> collection, final Enumeration<T> enumeration) {
@@ -234,7 +234,7 @@ public abstract class CollectionUtils {
    * @param iterable
    *          to wrap as unmodifiable
    * @return unmodifiable {@link Iterable}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final <T> Iterable<T> unmodifiableIterable(final Iterable<T> iterable) {
     return new UnmodifiableIterable<T>(iterable);
@@ -245,7 +245,7 @@ public abstract class CollectionUtils {
    * {@link Collections#unmodifiableCollection(Collection)}.
    * 
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static private class UnmodifiableIterable<T> implements Iterable<T> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/IOUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/IOUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/IOUtils.java
index 3effd69..3930a86 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/IOUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/IOUtils.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
 /**
  * Reusable Input/Output operation utility methods.
  * <p/>
- * @since 6.6
+ * @since GemFire 6.6
  */
 @SuppressWarnings("unused")
 public abstract class IOUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/LogFileUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/LogFileUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/LogFileUtils.java
index b1ac33f..5b78175 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/LogFileUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/LogFileUtils.java
@@ -30,7 +30,7 @@ import java.io.OutputStream;
 /**
  * Utility class for copying log files
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class LogFileUtils {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/StackTraceCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/StackTraceCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/StackTraceCollector.java
index 9e3238d..f26d80e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/StackTraceCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/StackTraceCollector.java
@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentSkipListSet;
  * </code> 
  * 
  *
- * @since 9.0
+ * @since Geode 1.0
  */
 public class StackTraceCollector {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/SunAPINotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/SunAPINotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/SunAPINotFoundException.java
index d3717a7..dc49079 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/SunAPINotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/SunAPINotFoundException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.util;
  * not be found, which is most likely the case when we are not running a Sun JVM (like HotSpot).
  * </p>
  * @see java.lang.RuntimeException
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class SunAPINotFoundException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Versionable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Versionable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Versionable.java
index 1c9cdcc..b3bd059 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Versionable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/Versionable.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.util;
  * A simple interface that describes the contract of an
  * object that has a version
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface Versionable
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
index 144c7a3..0000fb9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/util/concurrent/CustomEntryConcurrentHashMap.java
@@ -128,7 +128,7 @@ import com.gemstone.gemfire.internal.util.ArrayUtils;
  * This class is a member of the <a href="{@docRoot}
  * /../technotes/guides/collections/index.html"> Java Collections Framework</a>.
  * 
- * @since 1.5
+ * @since GemFire 1.5
  * @author Doug Lea
  * @param <K>
  *          the type of keys maintained by this map
@@ -1133,7 +1133,7 @@ RETRYLOOP:
    * value equality instead of equals method.
    * 
    * swale
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static final class IdentitySegment<K, V> extends Segment<K, V> implements
       Serializable {
@@ -1339,7 +1339,7 @@ RETRYLOOP:
    *           if the initial capacity of elements is negative or the load
    *           factor is nonpositive
    * 
-   * @since 1.6
+   * @since GemFire 1.6
    */
   public CustomEntryConcurrentHashMap(final int initialCapacity, final float loadFactor) {
     this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL, false);
@@ -1683,7 +1683,7 @@ RETRYLOOP:
    * Also allows invoking a method when removing from map by a call to
    * {@link #removeConditionally(Object, MapCallback, Object, Object)}.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    * 
    * @param <K>
    *          the type of key of the map

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/lang/AttachAPINotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/lang/AttachAPINotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/lang/AttachAPINotFoundException.java
index ac382e5..16e4a17 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/lang/AttachAPINotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/lang/AttachAPINotFoundException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.lang;
  * set on the user's classpath
  * <p/>
  * @see java.lang.RuntimeException
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class AttachAPINotFoundException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/lang/Identifiable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/lang/Identifiable.java b/geode-core/src/main/java/com/gemstone/gemfire/lang/Identifiable.java
index fa27115..f2c3dfd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/lang/Identifiable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/lang/Identifiable.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
  * <p/>
  * @param <T> the class type of the identifier.
  * @see java.lang.Comparable
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface Identifiable<T extends Comparable<T>> extends Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/AlreadyRunningException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/AlreadyRunningException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/AlreadyRunningException.java
index 1cd4d2c..369a6e3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/AlreadyRunningException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/AlreadyRunningException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management;
  * Indicates that a request to start a management service
  * failed because it was already running.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class AlreadyRunningException extends ManagementException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/AsyncEventQueueMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/AsyncEventQueueMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/AsyncEventQueueMXBean.java
index 4e0f8df..b56012f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/AsyncEventQueueMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/AsyncEventQueueMXBean.java
@@ -25,7 +25,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 /**
  * MBean that provides access to an {@link AsyncEventQueue}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationContext.OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/CacheServerMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/CacheServerMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/CacheServerMXBean.java
index 7ce1c88..e0e4803 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/CacheServerMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/CacheServerMXBean.java
@@ -53,7 +53,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * </tr>
  * </table>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ClientHealthStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ClientHealthStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ClientHealthStatus.java
index 232f2bc..06558a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ClientHealthStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ClientHealthStatus.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * Composite data type used to distribute statistics which can be used to 
  * determine the health of a cache client.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ClientHealthStatus {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ClientQueueDetail.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ClientQueueDetail.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ClientQueueDetail.java
index 0f032ae..950cd88 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ClientQueueDetail.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ClientQueueDetail.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.management;
 
 /**
  * 
- * @since  8.0
+ * @since GemFire  8.0
  */
 public class ClientQueueDetail {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DependenciesNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DependenciesNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DependenciesNotFoundException.java
index 5a14c32..6de181d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DependenciesNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DependenciesNotFoundException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Indicates that required dependencies were not found in the ClassPath.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DependenciesNotFoundException extends GemFireException {
   private static final long serialVersionUID = 9082304929238159814L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupResult.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupResult.java
index 9782b53..5071f33 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupResult.java
@@ -22,7 +22,7 @@ import java.beans.ConstructorProperties;
  * Composite data type used to distribute the results of a disk backup
  * operation.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DiskBackupResult {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupStatus.java
index 7df0302..a6fd76b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskBackupStatus.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.persistence.PersistentID;
  * Composite data type used to distribute the status of disk backup
  * operations.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DiskBackupStatus {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DiskMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskMetrics.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskMetrics.java
index 1436f79..080d070 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskMetrics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskMetrics.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.DiskStore;
 /**
  * Composite data type used to distribute metrics for a {@link DiskStore}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DiskMetrics {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DiskStoreMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskStoreMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskStoreMXBean.java
index bf5eaad..a7878ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DiskStoreMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DiskStoreMXBean.java
@@ -26,7 +26,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link DiskStore}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
@@ -189,7 +189,7 @@ public interface DiskStoreMXBean {
    * disk volume.
    * 
    * @return the warning percent
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public float getDiskUsageWarningPercentage();
 
@@ -198,7 +198,7 @@ public interface DiskStoreMXBean {
    * 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/management/DistributedLockServiceMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedLockServiceMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedLockServiceMXBean.java
index 1e8588c..73c8aae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedLockServiceMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedLockServiceMXBean.java
@@ -29,7 +29,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * Since any number of DistributedLockService objects can be created by a member there may be 0 or
  * more instances of this MBean available.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationContext.OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
index 5f7cc50..2f71cea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedRegionMXBean.java
@@ -30,7 +30,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link Region}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationContext.OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java
index 6dac6af..3fdeb2a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/DistributedSystemMXBean.java
@@ -69,7 +69,7 @@ import com.gemstone.gemfire.management.internal.security.ResourceOperation;
  * </tr>
  * </table>
  *
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/EvictionAttributesData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/EvictionAttributesData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/EvictionAttributesData.java
index 76760d1..4337751 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/EvictionAttributesData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/EvictionAttributesData.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.Region;
  * Composite data type used to distribute the eviction attributes for
  * a {@link Region}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 public class EvictionAttributesData {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/FixedPartitionAttributesData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/FixedPartitionAttributesData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/FixedPartitionAttributesData.java
index 904ad5a..c4d63b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/FixedPartitionAttributesData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/FixedPartitionAttributesData.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
  * Composite date type used to distribute the fixed partition attributes for
  * a {@link Region}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FixedPartitionAttributesData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
index 78831a9..7779fc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
@@ -26,7 +26,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link GatewayReceiver}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
index 3a5e6bf..2b6f6cd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
@@ -26,7 +26,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link GatewaySender}.
  *
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
index 07dad13..5f09d7d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GemFireProperties.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management;
 
 /**
  * Composite Data type to be used by member to depict gemfire properties in key value manner
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class GemFireProperties {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java
index 68bf547..28984e0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationType.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.management;
  * 
  * For detail usage see GemFire quick start.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface JMXNotificationType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationUserData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationUserData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationUserData.java
index 53560a2..4385ba9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationUserData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/JMXNotificationUserData.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management;
  * This interface acts as UserData section of JMX notifications of type "system.alert".
  * It contains some additional information apart from the Notification details.
  * 
- * @since  8.0
+ * @since GemFire  8.0
  */
 public interface JMXNotificationUserData { 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/JVMMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/JVMMetrics.java b/geode-core/src/main/java/com/gemstone/gemfire/management/JVMMetrics.java
index 0d4c9eb..ba7958f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/JVMMetrics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/JVMMetrics.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.Region;
  * Composite data type used to distribute metrics for the JVM running
  * a GemFire member.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class JVMMetrics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/LocatorMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/LocatorMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/LocatorMXBean.java
index 1019350..edeb302 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/LocatorMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/LocatorMXBean.java
@@ -26,7 +26,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link Locator}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationContext.OperationCode.READ)
 public interface LocatorMXBean {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/LockServiceMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/LockServiceMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/LockServiceMXBean.java
index 9b8473f..41f75f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/LockServiceMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/LockServiceMXBean.java
@@ -29,7 +29,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * {@link DLockService}.  Since any number of DLockService objects can be created
  * by a member there may be 0 or more instances of this MBean available.
  *
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementException.java
index b4d84d1..9dfcd3c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementException.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.GemFireException;
  * Various management and monitoring exceptions are wrapped in
  * <code>ManagementException<code>s.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class ManagementException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementService.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementService.java
index 492fdef..d38e652 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagementService.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.management.membership.MembershipListener;
 /**
  * Interface to the GemFire management service for a single Cache.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class  ManagementService{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ManagerMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagerMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagerMXBean.java
index 7d8d341..5fab26a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ManagerMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ManagerMXBean.java
@@ -28,7 +28,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * MBean that provides access to information and management functionality for a
  * {@link Manager}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java
index c5d9933..0f695a3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/MemberMXBean.java
@@ -136,7 +136,7 @@ import com.gemstone.gemfire.management.internal.security.ResourceOperation;
  * </tr>
  * </table>
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
 public interface MemberMXBean {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/NetworkMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/NetworkMetrics.java b/geode-core/src/main/java/com/gemstone/gemfire/management/NetworkMetrics.java
index 48b4e97..f5d49d7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/NetworkMetrics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/NetworkMetrics.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.DiskStore;
 /**
  * Composite data type used to distribute network related metrics for a member.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class NetworkMetrics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/OSMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/OSMetrics.java b/geode-core/src/main/java/com/gemstone/gemfire/management/OSMetrics.java
index 9b8fe79..9f3fabb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/OSMetrics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/OSMetrics.java
@@ -22,7 +22,7 @@ import java.beans.ConstructorProperties;
  * Composite data type used to distribute metrics for the operating system hosting
  * a member of the distributed system.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class OSMetrics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/PartitionAttributesData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/PartitionAttributesData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/PartitionAttributesData.java
index d26c04b..603eec0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/PartitionAttributesData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/PartitionAttributesData.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 /**
  * Composite date type used to distribute attributes for a {@link PartitionedRegion}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class PartitionAttributesData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/PersistentMemberDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/PersistentMemberDetails.java b/geode-core/src/main/java/com/gemstone/gemfire/management/PersistentMemberDetails.java
index 4169a83..5893ee9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/PersistentMemberDetails.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/PersistentMemberDetails.java
@@ -22,7 +22,7 @@ import java.beans.ConstructorProperties;
  * Composite data type used to distribute attributes for the missing disk
  * store of a persistent member.
  *
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class PersistentMemberDetails {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/RegionAttributesData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionAttributesData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionAttributesData.java
index 1597f7e..a9ff767 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionAttributesData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionAttributesData.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
 /**
  * Composite data type used to distribute attributes for a {@link Region}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionAttributesData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
index e49f00e..8becc8d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/RegionMXBean.java
@@ -31,7 +31,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * 
  * For all the latency related attributes e.g. PutRemoteLatency ,DiskWritesAverageLatency etc..
  * "enable-time-statistics" should be set to true. 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 @ResourceOperation(resource = Resource.CLUSTER, operation = OperationContext.OperationCode.READ)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/ServerLoadData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/ServerLoadData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/ServerLoadData.java
index 84ac4ee..90ebc8e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/ServerLoadData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/ServerLoadData.java
@@ -21,7 +21,7 @@ import java.beans.ConstructorProperties;
 /**
  * Composite data type used to distribute server load information.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ServerLoadData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
index 905f5d2..a5ed7c5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
  * An annotation to define additional meta-data for commands.
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.PARAMETER })
@@ -72,7 +72,7 @@ public @interface CliMetaData {
   // TODO - Abhishek - refactor to group this
 //  /**
 //   *
-//   * @since 8.0
+//   * @since GemFire 8.0
 //   */
 //  @Retention(RetentionPolicy.RUNTIME)
 //  @Target({ ElementType.PARAMETER })
@@ -87,7 +87,7 @@ public @interface CliMetaData {
    * An annotation to define additional meta-data for availability of commands.
    * 
    *
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @Retention(RetentionPolicy.RUNTIME)
   @Target({ ElementType.METHOD })

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandProcessingException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandProcessingException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandProcessingException.java
index c1dbce2..b116bd8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandProcessingException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandProcessingException.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.management.cli;
  * <li>errors from invalid values for parameters
  * </ul>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandProcessingException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandService.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandService.java
index df80788..8ed9b9e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandService.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.remote.MemberCommandService;
  * GemFire Manager nodes.
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class CommandService {
   protected static final Map<String, String> EMPTY_ENV = Collections.emptyMap();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandServiceException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandServiceException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandServiceException.java
index 74451e0..74f57a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandServiceException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandServiceException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.management.cli;
  * Service for processing GemFire Command Line Interface (CLI) commands.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandServiceException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandStatement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandStatement.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandStatement.java
index 9ca5828..669caeb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandStatement.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CommandStatement.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * the same command string repeatedly.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface CommandStatement {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/ConverterHint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/ConverterHint.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/ConverterHint.java
index a1e70e7..54c93b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/ConverterHint.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/ConverterHint.java
@@ -22,7 +22,7 @@ import org.springframework.shell.core.annotation.CliOption;
  * Used in {@link CliOption} annotations to indicate which converter(s) should
  * or should not be used.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ConverterHint {
   public static final String DIRS                  = "converter.hint.dirs";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/cli/Result.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/Result.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/Result.java
index 7480d48..343e944 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/Result.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/Result.java
@@ -31,14 +31,14 @@ import java.io.IOException;
  * {@link #hasIncomingFiles()}.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface Result {
   
   /**
    * Indicates a Results status.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public enum Status {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/BaseManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/BaseManagementService.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/BaseManagementService.java
index d159d96..c441359 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/BaseManagementService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/BaseManagementService.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.management.ManagementService;
 /**
  * Super class to all Management Service
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class BaseManagementService extends ManagementService {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
index 478c8e8..f95d8d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/FederatingManager.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.management.ManagementException;
  * The FederatingManager is only appropriate for a peer or server in a GemFire
  * distributed system.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FederatingManager extends Manager {
   public static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JettyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JettyHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JettyHelper.java
index 749959a..42dcd64 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JettyHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JettyHelper.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
 import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
- * @since 8.1
+ * @since GemFire 8.1
  */
 @SuppressWarnings("unused")
 public class JettyHelper {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java
index 6be30a5..c82ce06 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisee.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.management.internal.JmxManagerAdvisor.JmxManagerProf
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JmxManagerAdvisee implements DistributionAdvisee {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
index 83e4e41..d836c16 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerAdvisor.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JmxManagerAdvisor extends DistributionAdvisor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
index d3f075d..861f51d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.Version;
  * Sent to a locator to request it to find (and possibly start)
  * a jmx manager for us. It returns a JmxManagerLocatorResponse.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class JmxManagerLocatorRequest implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorResponse.java
index bdd10f7..31163d4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorResponse.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.Version;
  * Sent to a locator to request it to find (and possibly start)
  * a jmx manager for us. It returns a JmxManagerLocatorResponse.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class JmxManagerLocatorResponse implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
index af35c1b..2d95993 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
@@ -75,7 +75,7 @@ import org.eclipse.jetty.server.ServerConnector;
  * control JMX server end points for the Platform MBeanServer and the GemFire
  * MBeans hosted within it.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ManagementAgent {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/Manager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/Manager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/Manager.java
index 7ed6f28..c5385ec 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/Manager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/Manager.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
  * It's responsible for defining JMX server endpoints for servicing JMX 
  * clients.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class Manager {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java
index 526bd2d..8b41548 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/RestAgent.java
@@ -39,7 +39,7 @@ import java.net.UnknownHostException;
  * The RestAgent is used to start http service in embedded mode on any non
  * manager data node with developer REST APIs service enabled.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class RestAgent {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SSLUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SSLUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SSLUtil.java
index eb88ad6..98248d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SSLUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SSLUtil.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
 
 /**
  * 
- * @since  8.1
+ * @since GemFire  8.1
  */
 public class SSLUtil {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SystemManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SystemManagementService.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SystemManagementService.java
index b773b94..e9778d9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SystemManagementService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/SystemManagementService.java
@@ -62,7 +62,7 @@ import org.apache.shiro.util.ThreadContext;
  * which is the gateway to various JMX operations over a GemFire
  * System
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class SystemManagementService extends BaseManagementService {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/AbstractCliAroundInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/AbstractCliAroundInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/AbstractCliAroundInterceptor.java
index 8edcb23..9b80072 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/AbstractCliAroundInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/AbstractCliAroundInterceptor.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
  * Semi-complete implementation of {@link CliAroundInterceptor} for convenience for implementors.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class AbstractCliAroundInterceptor implements CliAroundInterceptor {
   protected enum Response {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliAroundInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliAroundInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliAroundInterceptor.java
index 050785a..de33be8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliAroundInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliAroundInterceptor.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.GfshExecutionStrategy;
  * intercept before & after actual command execution.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface CliAroundInterceptor {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliUtil.java
index 4b69e66..30ae97b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CliUtil.java
@@ -74,7 +74,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
  * Line Interface (CLI).
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CliUtil {
   public static final String GFSHVM_IDENTIFIER = "gfsh";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
index 9c8025e..1b5c1d3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.management.internal.cli.util.ClasspathScanLoadHelper
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandManager {
   //1. Load Commands, availability indicators - Take from GfshParser
@@ -148,7 +148,7 @@ public class CommandManager {
   /**
    * Loads commands via {@link ServiceLoader} from {@link ClassPathLoader}. 
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private void loadPluginCommands() {
     final Iterator<CommandMarker> iterator  = ServiceLoader.load(CommandMarker.class, ClassPathLoader.getLatest().asClassLoader()).iterator();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandRequest.java
index e1a4f2c..ffbad51 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandRequest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * The CommandRequest class encapsulates information pertaining to the command the user entered in Gfsh.
  * <p/>
  * @see com.gemstone.gemfire.management.internal.cli.GfshParseResult
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class CommandRequest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponse.java
index 27aba1f..669876c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponse.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandResponse {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseBuilder.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseBuilder.java
index c54895d..4db2a83 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseBuilder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseBuilder.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandResponseBuilder {
   // Command Response Constants

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseWriter.java
index 4058009..89a6d8d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandResponseWriter.java
@@ -29,7 +29,7 @@ import java.io.StringWriter;
  * NOTE: Not thread safe 
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandResponseWriter {
   private PrintWriter pwriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParseResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParseResult.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParseResult.java
index 87a6050..7cc2df4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParseResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParseResult.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.OperationInvoker;
  * command and send it to ManagementMBean via {@link OperationInvoker}.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshParseResult extends ParseResult {
   private String userInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParser.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParser.java
index ce23263..e59ba2b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/GfshParser.java
@@ -67,7 +67,7 @@ import com.gemstone.gemfire.management.internal.cli.util.CLIConsoleBufferUtil;
  * Implementation of the {@link Parser} interface for GemFire SHell (gfsh)
  * requirements.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshParser implements Parser {
   public static final String LINE_SEPARATOR = System.getProperty("line.separator");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/Launcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/Launcher.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/Launcher.java
index 5d57db6..442b53a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/Launcher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/Launcher.java
@@ -65,7 +65,7 @@ import joptsimple.OptionSet;
  *  </ol>
  * </ul>
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class Launcher {
   private static final String EXECUTE_OPTION = "execute";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/LogWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/LogWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/LogWrapper.java
index 81aa675..0bb2b35 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/LogWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/LogWrapper.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.GfshConfig;
  * 2. on a Manager "if" log is required to be sent back to gfsh too. For
  *    logging only on manager use, cache.getLogger()
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LogWrapper {
   private static Object INSTANCE_LOCK = new Object();
@@ -299,7 +299,7 @@ public class LogWrapper {
 
   /**
    *
-   * @since 7.0
+   * @since GemFire 7.0
    */
   // Formatter code "copied" from LogWriterImpl
   static class GemFireFormatter extends Formatter {
@@ -411,7 +411,7 @@ public class LogWrapper {
   /**
    * Handler to write to CommandResponseWriter
    *
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class CommandResponseWriterHandler extends Handler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/annotation/CliArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/annotation/CliArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/annotation/CliArgument.java
index 8c2ae3c..08ecc65 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/annotation/CliArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/annotation/CliArgument.java
@@ -27,7 +27,7 @@ import org.springframework.shell.core.annotation.CliCommand;
 /**
  * Annotation for Argument of a Command
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupport.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupport.java
index c99816d..36b4a40 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupport.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupport.java
@@ -45,7 +45,7 @@ import org.springframework.shell.core.CommandMarker;
  * @see com.gemstone.gemfire.distributed.DistributedMember
  * @see com.gemstone.gemfire.management.internal.cli.shell.Gfsh
  * @see org.springframework.shell.core.CommandMarker
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public abstract class AbstractCommandsSupport implements CommandMarker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommands.java
index e4af89f..42f8040 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommands.java
@@ -57,7 +57,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class ClientCommands implements CommandMarker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
index c7db419..8c89838 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
@@ -67,7 +67,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.OperationCo
 import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 
 /****
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class ConfigCommands implements CommandMarker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 1e19861..d27786f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -87,7 +87,7 @@ import org.springframework.shell.core.annotation.CliOption;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
   public static final Set<RegionShortcut> PERSISTENT_OVERFLOW_SHORTCUTS = new TreeSet<RegionShortcut>();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
index 778089e..8d93344 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
@@ -82,7 +82,7 @@ import org.springframework.shell.core.annotation.CliOption;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DataCommands implements CommandMarker {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
index 3b51eaf..7729dfb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
@@ -57,7 +57,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * Commands for deploying, un-deploying and listing files deployed using the command line shell.
  * <p/>
  * @see com.gemstone.gemfire.management.internal.cli.commands.AbstractCommandsSupport
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class DeployCommands extends AbstractCommandsSupport implements CommandMarker {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
index a73edb3..36eda43 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
@@ -102,7 +102,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * The DiskStoreCommands class encapsulates all GemFire Disk Store commands in Gfsh.
  * </p>
  * @see com.gemstone.gemfire.management.internal.cli.commands.AbstractCommandsSupport
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class DiskStoreCommands extends AbstractCommandsSupport {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
index 265831a..5469e22 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
@@ -70,7 +70,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class FunctionCommands implements CommandMarker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
index 9ca4487..ac961cb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
@@ -38,7 +38,7 @@ import java.util.Set;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshHelpCommands implements CommandMarker{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
index e744eea..d2ca5f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
@@ -70,7 +70,7 @@ import org.springframework.shell.core.annotation.CliOption;
  * @see com.gemstone.gemfire.management.internal.cli.commands.AbstractCommandsSupport
  * @see com.gemstone.gemfire.management.internal.cli.domain.IndexDetails
  * @see com.gemstone.gemfire.management.internal.cli.functions.ListIndexFunction
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class IndexCommands extends AbstractCommandsSupport {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index eca3e65..5ddcc51 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -124,7 +124,7 @@ import org.springframework.shell.core.annotation.CliOption;
  * @see com.gemstone.gemfire.distributed.ServerLauncher
  * @see com.gemstone.gemfire.management.internal.cli.commands.AbstractCommandsSupport
  * @see com.gemstone.gemfire.management.internal.cli.shell.Gfsh
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class LauncherLifecycleCommands extends AbstractCommandsSupport {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/MapType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/MapType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/MapType.java
index 2a3770b..d532f53 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/MapType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/MapType.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache.query.types;
  * The type of the keys is obtained from the getKeyType method, and the type
  * of the values is obtained from the getElementType method.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface MapType extends CollectionType {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/ObjectType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/ObjectType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/ObjectType.java
index 62241d1..92ce907 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/ObjectType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/ObjectType.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.DataSerializable;
  * @see CollectionType
  * @see MapType
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface ObjectType extends DataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/StructType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/StructType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/StructType.java
index 6a5202d..92c3d59 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/StructType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/StructType.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query.types;
  * Describes the field names and types for each field in a {@link
  * com.gemstone.gemfire.cache.query.Struct}.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface StructType extends ObjectType {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/CacheServer.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/CacheServer.java
index a95b390..8aac772 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/CacheServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/CacheServer.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * @see com.gemstone.gemfire.cache.Cache#addCacheServer
  * @see com.gemstone.gemfire.cache.Cache#getCacheServers
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface CacheServer {
   /** The default port on which a <Code>CacheServer</code> is
@@ -48,7 +48,7 @@ public interface CacheServer {
    * The default number of sockets accepted by a CacheServer. 
    * When the maximum is reached the cache server will stop accepting new connections.
    * Current value: 800
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final int DEFAULT_MAX_CONNECTIONS = 800;
   // Value derived from common file descriptor limits for Unix sytems (1024)... 
@@ -63,7 +63,7 @@ public interface CacheServer {
    * and to be dedicated to detecting client requests on that connection. A selector
    * is not used in this default mode.
    * Current value: 0
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final int DEFAULT_MAX_THREADS = 0;
 
@@ -101,7 +101,7 @@ public interface CacheServer {
   /**
    * The default list of server groups a cache server belongs to.
    * The current default is an empty list.
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
   public static final String[] DEFAULT_GROUPS = new String[0];
@@ -109,7 +109,7 @@ public interface CacheServer {
   /**
    * The default load balancing probe. The default load balancing
    * probe reports the connections counts of this cache server. 
-   * @since 5.7
+   * @since GemFire 5.7
    *  
    */
   public static final ServerLoadProbe DEFAULT_LOAD_PROBE = new ConnectionCountProbe();
@@ -117,7 +117,7 @@ public interface CacheServer {
   /**
    * The default frequency at which to poll the load probe for the load
    * on this cache server. Defaults to 5000 (5 seconds).
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final long DEFAULT_LOAD_POLL_INTERVAL = 5000;
 
@@ -125,7 +125,7 @@ public interface CacheServer {
    * The default ip address or host name that the cache server's socket will
    * listen on for client connections.
    * The current default is an empty string.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final String DEFAULT_BIND_ADDRESS = "";
 
@@ -133,7 +133,7 @@ public interface CacheServer {
    * The default ip address or host name that will be given to clients
    * as the host this cache server is listening on.
    * The current default is an empty string.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final String DEFAULT_HOSTNAME_FOR_CLIENTS = "";
   
@@ -161,7 +161,7 @@ public interface CacheServer {
    * will listen on.
    * @return the ip address or host name that this cache server is to listen on
    * @see #DEFAULT_BIND_ADDRESS
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getBindAddress();
   /**
@@ -180,7 +180,7 @@ public interface CacheServer {
    * <p> A <code>null</code> value will be treated the same as the default <code>""</code>.
    * @param address the ip address or host name that this cache server is to listen on
    * @see #DEFAULT_BIND_ADDRESS
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setBindAddress(String address);
   /**
@@ -189,7 +189,7 @@ public interface CacheServer {
    * @return the ip address or host name to give to clients so they can connect
    *         to this cache server
    * @see #DEFAULT_HOSTNAME_FOR_CLIENTS
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getHostnameForClients();
   /**
@@ -205,7 +205,7 @@ public interface CacheServer {
    * @param name the ip address or host name that will be given to clients
    *   so they can connect to this cache server
    * @see #DEFAULT_HOSTNAME_FOR_CLIENTS
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setHostnameForClients(String name);
   /**
@@ -224,7 +224,7 @@ public interface CacheServer {
    * pushed to the client. The client does not need to request the new value
    * from the cache server.
    *
-   * @since 4.2
+   * @since GemFire 4.2
    * @deprecated as of 6.0.1. This method is no longer in use, by default 
    * notifyBySubscription attribute is set to true.
    */
@@ -235,7 +235,7 @@ public interface CacheServer {
    * Answers whether or not this cache server should notify clients based on
    * key subscription.
    *
-   * @since 4.2
+   * @since GemFire 4.2
    * @deprecated as of 6.0.1. This method is no more in use, by default 
    * notifyBySubscription attribute is set to true.
    */
@@ -248,7 +248,7 @@ public interface CacheServer {
    *
    * @param socketBufferSize The size in bytes of the socket buffer
    *
-   * @since 4.2.1
+   * @since GemFire 4.2.1
    */
   public void setSocketBufferSize(int socketBufferSize);
 
@@ -258,7 +258,7 @@ public interface CacheServer {
    * @return the configured buffer size of the socket connection for this
    * <code>CacheServer</code>
    *
-   * @since 4.2.1
+   * @since GemFire 4.2.1
    */
   public int getSocketBufferSize();
 
@@ -270,7 +270,7 @@ public interface CacheServer {
    * @param maximumTimeBetweenPings The maximum amount of time between client
    * pings
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings);
 
@@ -280,7 +280,7 @@ public interface CacheServer {
    * of this <code>CacheServer</code>'s clients. The default is 60000 ms.
    * @return the maximum amount of time between client pings.
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public int getMaximumTimeBetweenPings();
 
@@ -324,7 +324,7 @@ public interface CacheServer {
    * client requests.
    * The default of <code>0</code> causes the cache server to dedicate a thread for
    * every client connection.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public int getMaxThreads();
 
@@ -335,7 +335,7 @@ public interface CacheServer {
    * every client connection.
    * 
    * @see #DEFAULT_MAX_THREADS
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void setMaxThreads(int maxThreads);
 
@@ -373,7 +373,7 @@ public interface CacheServer {
    * @param groups possibly empty array of <code>String</code> where each string
    * is a server groups that this cache server will be a member of.
    * @see #DEFAULT_GROUPS
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
   public void setGroups(String[] groups);
@@ -382,7 +382,7 @@ public interface CacheServer {
    * @return a possibly empty array of <code>String</code>s where
    * each string is a server group. Modifying this array will not change the
    * server groups that this cache server belongs to.
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of 7.0 use the groups gemfire property
    */
   public String[] getGroups();
@@ -392,7 +392,7 @@ public interface CacheServer {
    * {@link ServerLoadProbe} for details on the load probe.
    * @return the load probe used by this cache
    * server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public ServerLoadProbe getLoadProbe();
 
@@ -402,7 +402,7 @@ public interface CacheServer {
    * a load probe.
    * @param loadProbe the load probe to use for
    * this cache server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setLoadProbe(ServerLoadProbe loadProbe);
 
@@ -445,7 +445,7 @@ public interface CacheServer {
    * {@link ClientSubscriptionConfig} for details on the client subscription configuration.
    * 
    * @return ClientSubscriptionConfig
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public ClientSubscriptionConfig getClientSubscriptionConfig();
   
@@ -454,7 +454,7 @@ public interface CacheServer {
    * <code>DistributedMember</code>
    * @return the <code>ClientSession</code> associated with the
    * <code>DistributedMember</code>
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ClientSession getClientSession(DistributedMember member);
   
@@ -463,14 +463,14 @@ public interface CacheServer {
    * durable client id
    * @return the <code>ClientSession</code> associated with the
    * durable
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ClientSession getClientSession(String durableClientId);
   
   /**
    * Returns a set of all <code>ClientSession</code>s
    * @return a set of all <code>ClientSession</code>s
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Set<ClientSession> getAllClientSessions();
 
@@ -481,7 +481,7 @@ public interface CacheServer {
    * @param listener 
    *          The <code>InterestRegistrationListener</code> to register 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */ 
   public void registerInterestRegistrationListener( 
       InterestRegistrationListener listener); 
@@ -493,7 +493,7 @@ public interface CacheServer {
    * @param listener 
    *          The <code>InterestRegistrationListener</code> to unregister 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */ 
   public void unregisterInterestRegistrationListener( 
       InterestRegistrationListener listener); 
@@ -505,7 +505,7 @@ public interface CacheServer {
    * @return a read-only set of <code>InterestRegistrationListener</code>s 
    *         registered with this notifier 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */ 
   public Set<InterestRegistrationListener> getInterestRegistrationListeners(); 
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ClientSubscriptionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ClientSubscriptionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ClientSubscriptionConfig.java
index d343967..9a4316c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ClientSubscriptionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ClientSubscriptionConfig.java
@@ -63,7 +63,7 @@ package com.gemstone.gemfire.cache.server;
  * @see #getCapacity
  * 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 
 public interface ClientSubscriptionConfig {
@@ -88,7 +88,7 @@ public interface ClientSubscriptionConfig {
    * will be in MB for eviction-policy <b>mem</b> else
    * number of entries
    * @see #DEFAULT_CAPACITY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getCapacity();
 
@@ -97,28 +97,28 @@ public interface ClientSubscriptionConfig {
    * will be in MB for eviction-policy <b>mem</b> else
    * number of entries
    * @see #DEFAULT_CAPACITY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setCapacity(int capacity);
 
   /**
    * Returns the eviction policy that is executed when capacity of the client queue is reached.
    * @see #DEFAULT_EVICTION_POLICY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getEvictionPolicy();
 
   /**
    * Sets the eviction policy that is executed when capacity of the client queue is reached.
    * @see #DEFAULT_EVICTION_POLICY
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setEvictionPolicy(String policy);
 
   /**
    * Sets the overflow directory for a client queue 
    * @param overflowDirectory the overflow directory for a client queue's overflowed entries
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of 6.5 use {@link #setDiskStoreName(String)} instead
    */
   public void setOverflowDirectory(String overflowDirectory);
@@ -128,20 +128,20 @@ public interface ClientSubscriptionConfig {
    * overflowed client queue entries.
    * @return the overflow directory for a client queue's
    * overflowed entries
-   * @since 5.7
+   * @since GemFire 5.7
    * @deprecated as of 6.5 use {@link #getDiskStoreName} instead
    */
   public String getOverflowDirectory();
   /**
    * Sets the disk store name for overflow  
    * @param diskStoreName 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setDiskStoreName(String diskStoreName);
 
   /**
    * get the diskStoreName for overflow
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public String getDiskStoreName();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoad.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoad.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoad.java
index 01acaa5..a0247f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoad.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoad.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.DataSerializable;
  * load + loadPerConnection*numAdditionalConnections.
  * </code>
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public final class ServerLoad implements DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbe.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbe.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbe.java
index 539c862..0848e94 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbe.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbe.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.cache.CacheCallback;
  * be called once for each cache server.
  * </p>
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public interface ServerLoadProbe extends CacheCallback {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbeAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbeAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbeAdapter.java
index b9c5cac..e64629a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbeAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerLoadProbeAdapter.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.server;
  * empty implementations for open and close. Applications can subclass this
  * class and only override the methods for the events of interest.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public abstract class ServerLoadProbeAdapter implements ServerLoadProbe {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerMetrics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerMetrics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerMetrics.java
index 1db5bc5..36f20c4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerMetrics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/ServerMetrics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.server;
  * Metrics about the resource usage for a cache server.
  * These metrics are provided to the {@link ServerLoadProbe} for
  * use in calculating the load on the server.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface ServerMetrics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ConnectionCountProbe.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ConnectionCountProbe.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ConnectionCountProbe.java
index 20a3357..59052f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ConnectionCountProbe.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ConnectionCountProbe.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.Declarable2;
  * hosted by this bridge server.
  * 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ConnectionCountProbe extends ServerLoadProbeAdapter implements
     Declarable2, DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
index 2ba0dbe..f98e2e1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/LoadMonitor.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * A class which monitors the load on a bridge server and 
  * periodically sends updates to the locator.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class LoadMonitor implements ConnectionListener {
@@ -116,7 +116,7 @@ public class LoadMonitor implements ConnectionListener {
   /**
    * Keeps track of the clients that have added a queue since the
    * last load was sent to the server-locator.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected final ArrayList clientIds = new ArrayList();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ServerMetricsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ServerMetricsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ServerMetricsImpl.java
index f7eb6d4..bcfc4af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ServerMetricsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/server/internal/ServerMetricsImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.server.ServerMetrics;
 
 /**
  * Metrics describing the load on a  bridge server.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class ServerMetricsImpl implements ServerMetrics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/CacheSnapshotService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/CacheSnapshotService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/CacheSnapshotService.java
index 989ce9a..3c57817 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/CacheSnapshotService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/CacheSnapshotService.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
  * @see Cache#getSnapshotService()
  * @see SnapshotOptions
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface CacheSnapshotService {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotService.java
index 30bac7b..32d8c45 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotService.java
@@ -66,7 +66,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
  * @see Region#getSnapshotService()
  * @see SnapshotOptions
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface RegionSnapshotService<K, V> {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotFilter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotFilter.java
index 2c9c5d6..0c7cc81 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotFilter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotFilter.java
@@ -28,7 +28,7 @@ import java.util.Map.Entry;
  * @see CacheSnapshotService
  * @see RegionSnapshotService
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface SnapshotFilter<K, V> extends Serializable {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotIterator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotIterator.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotIterator.java
index 12b9660..07206ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotIterator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotIterator.java
@@ -29,7 +29,7 @@ import java.util.Map.Entry;
  * 
  * @see SnapshotReader
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface SnapshotIterator<K, V> {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotOptions.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotOptions.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotOptions.java
index ff8d7d3..01b4196 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotOptions.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotOptions.java
@@ -29,13 +29,13 @@ import java.io.Serializable;
  * @param <K> the cache entry key type
  * @param <V> the cache entry value type
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface SnapshotOptions<K, V> extends Serializable {
   /**
    * Defines the available snapshot file formats.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public enum SnapshotFormat {
     /** an optimized binary format specific to GemFire */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotReader.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotReader.java
index e909fac..31e4f99 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/snapshot/SnapshotReader.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
 /**
  * Provides utilities for reading cache data.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class SnapshotReader {
   private SnapshotReader() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheListenerAdapter.java
index 3b70604..ccbf5b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheListenerAdapter.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.cache.RegionEvent;
  * </p>
  * 
  * 
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheListenerAdapter<K,V> implements CacheListener<K,V> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheWriterAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheWriterAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheWriterAdapter.java
index 940cb3d..60f23ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheWriterAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CacheWriterAdapter.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.RegionEvent;
  * only override the methods for the events of interest.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheWriterAdapter<K,V> implements CacheWriter<K,V> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CqListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CqListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CqListenerAdapter.java
index 4325af9..ef2397e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CqListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/CqListenerAdapter.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache.util;
  * with empty implementations. Applications can subclass this class and only
  * override the methods of interest.
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 import com.gemstone.gemfire.cache.query.CqListener;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/Gateway.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/Gateway.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/Gateway.java
index 3f6e9e5..296bc02 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/Gateway.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/Gateway.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.util;
  * rolling upgrade support when GatewaySenderProfile update request comes from or sent to old member.
  * Old member uses Gateway$OrderPolicy while latest members uses GatewaySender#OrderPolicy
  * 
- * @since 9.0
+ * @since Geode 1.0
  *
  */
 public class Gateway {
@@ -30,7 +30,7 @@ public class Gateway {
   /**
    * The order policy. This enum is applicable only when concurrency-level is > 1.
    * 
-   * @since 6.5.1
+   * @since GemFire 6.5.1
    */
   public enum OrderPolicy {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictHelper.java
index 2f47d95..255c710 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictHelper.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.util;
  * GatewayConflictHelper is used by an GatewayConflictResolver to decide what to
  * do with an event received from another distributed system that is going to overwrite
  * the current cache state.
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewayConflictHelper {
   /** disallow the event */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictResolver.java
index 35acd6e..208a225 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayConflictResolver.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.cache.util;
  * different distributed system (with a different distributed-system-id) than an event
  * that is attempting to modify the entry.  It is not invoked if the event has the same
  * distributed system ID as the event that last changed the entry.
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewayConflictResolver {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayEvent.java
index a97dd4d..a73b6d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/GatewayEvent.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
  * Interface <code>GatewayEvent</code> represents <code>Cache</code> events
  * delivered to <code>Gateway</code>s.
  *
- * @since 5.1
+ * @since GemFire 5.1
  * 
  * @deprecated as of GemFire 8.0. Use {@link com.gemstone.gemfire.cache.wan.GatewayQueueEvent} instead
  * 
@@ -84,7 +84,7 @@ public interface GatewayEvent {
    * Returns the creation timestamp in milliseconds.
    * @return the creation timestamp in milliseconds
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public long getCreationTime();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/ObjectSizer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/ObjectSizer.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/ObjectSizer.java
index d13ccdc..895fa69 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/ObjectSizer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/ObjectSizer.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer;
  * object sizer, which is {#link {@link #SIZE_CLASS_ONCE}
  * 
  * 
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface ObjectSizer {
 
@@ -51,7 +51,7 @@ public interface ObjectSizer {
    * time, because there is very little performance impact from sizing these
    * objects.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final ObjectSizer SIZE_CLASS_ONCE = SizeClassOnceObjectSizer.getInstance();
 
@@ -65,14 +65,14 @@ public interface ObjectSizer {
    * For objects that are all approximately the same size, consider using
    * {@link #SIZE_CLASS_ONCE}. It will have much better performance.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final ObjectSizer REFLECTION_SIZE = ReflectionObjectSizer.getInstance();
   
   
   /**
    * The default object sizer, currently {@link #SIZE_CLASS_ONCE}
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final ObjectSizer DEFAULT = SIZE_CLASS_ONCE;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionMembershipListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionMembershipListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionMembershipListenerAdapter.java
index e9cf60c..a4167bf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/RegionMembershipListenerAdapter.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * override the methods for the events of interest.
  * 
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public abstract class RegionMembershipListenerAdapter<K,V> 
 extends CacheListenerAdapter<K,V> 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TimestampedEntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TimestampedEntryEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TimestampedEntryEvent.java
index 6b6c964..c714d63 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TimestampedEntryEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TimestampedEntryEvent.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.util;
  * clock value from the point of origin of the event and the distributed system ID
  * of the system that caused the change.  It also has this information for the
  * previous change to the entry.
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface TimestampedEntryEvent extends com.gemstone.gemfire.cache.EntryEvent {
   // note that this interface inherits the following methods, among others:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TransactionListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TransactionListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TransactionListenerAdapter.java
index 7b8574f..ab0e16e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TransactionListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/TransactionListenerAdapter.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.TransactionEvent;
  * override the methods for the events of interest.
  * 
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public abstract class TransactionListenerAdapter implements TransactionListener {
   public void afterCommit(TransactionEvent event) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayEventFilter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayEventFilter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayEventFilter.java
index 447a015..2ed3ea6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayEventFilter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayEventFilter.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.CacheCallback;
  * distributed system
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewayEventFilter extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayQueueEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayQueueEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayQueueEvent.java
index c0df6dd..07d92c9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayQueueEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayQueueEvent.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
  * <code>GatewaySender</code>s.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewayQueueEvent<K, V> {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiver.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiver.java
index 49602e5..ba757ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiver.java
@@ -67,7 +67,7 @@ public interface GatewayReceiver {
   /**
    * The default value (true) for manually starting a
    * <code>GatewayReceiver</code>.
-   * @since 8.1 
+   * @since GemFire 8.1
    */
   public static final boolean DEFAULT_MANUAL_START = false;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiverFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiverFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiverFactory.java
index 7010eb4..38e0316 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiverFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewayReceiverFactory.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.wan;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewayReceiverFactory {
   /**
@@ -97,7 +97,7 @@ public interface GatewayReceiverFactory {
   /**
    * Sets the manual start boolean property for this
    * <code>GatewayReceiver</code>. 
-   * @since 8.1
+   * @since GemFire 8.1
    * Default is true i.e. the <code>GatewayReceiver</code> will not start automatically once created.
    * Ideal default value should be false to match with GatewaySender
    * counterpart. But to not to break the existing functionality default value

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySender.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySender.java
index b0ad410..bc6c184 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySender.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GatewaySender {
 
@@ -145,7 +145,7 @@ public interface GatewaySender {
   /**
    * The order policy. This enum is applicable only when concurrency-level is > 1.
    * 
-   * @since 6.5.1
+   * @since GemFire 6.5.1
    */
   public enum OrderPolicy {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySenderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySenderFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySenderFactory.java
index f336de4..4ecf8ae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySenderFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/wan/GatewaySenderFactory.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
  * Factory to create SerialGatewaySender
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * @see GatewaySender
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java b/geode-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
index 43978f9..512756a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * An implementation of {@link Compressor} for Google's Snappy compression
  * codec. Utilizes the xerial java-snappy wrapper.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class SnappyCompressor implements Compressor, Serializable {
   private static final long serialVersionUID = 496609875302446099L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
index 3e0b4de..c29185a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
  * @see java.lang.Comparable
  * @see java.lang.Runnable
  * @see com.gemstone.gemfire.lang.Identifiable
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class AbstractLauncher<T extends Comparable<T>> implements Runnable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/ClientSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ClientSocketFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ClientSocketFactory.java
index 7b3bc12..906339a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ClientSocketFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ClientSocketFactory.java
@@ -27,7 +27,7 @@ import java.net.Socket;
  * factory to manufacture sockets when it connects to server caches.
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public interface ClientSocketFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
index 3b0dc19..3779cdc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedMember.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * system. A process becomes a member by calling {@link 
  * DistributedSystem#connect}.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface DistributedMember extends Comparable<DistributedMember> {
 
@@ -32,7 +32,7 @@ public interface DistributedMember extends Comparable<DistributedMember> {
    * Returns this member's name. The member name is set using
    * the "name" gemfire property. Returns "" if the member
    * does not have a name.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public String getName();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 3a52ee0..eaf1ee7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -1480,7 +1480,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * </dl>
  * 
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class DistributedSystem implements StatisticsFactory {
 
@@ -1686,7 +1686,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @param conserveSockets If <code>true</code> then calling thread will share
    *   socket connections with other threads.
    *   If <code>false</code> then calling thread will have its own sockets.
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public static void setThreadsSocketPolicy(boolean conserveSockets) {
     if (conserveSockets) {
@@ -1700,7 +1700,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
 
   /**
    * Frees up any socket resources owned by the calling thread.
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public static void releaseThreadsSockets() {
     ConnectionTable.releaseThreadsSockets();
@@ -1710,7 +1710,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * Returns an existing connection to the distributed system
    * described by the given properties.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private static DistributedSystem getConnection(Properties config) {
     // In an admin VM you can have a connection to more than one
@@ -1734,7 +1734,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * appropriate for administration.  This method is for internal use
    * only by the admin API.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected static DistributedSystem connectForAdmin(Properties props) {
     DistributedSystem existing = getConnection(props);
@@ -1755,7 +1755,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
 
   /**
    * see {@link com.gemstone.gemfire.admin.AdminDistributedSystemFactory}
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected static void setEnableAdministrationOnly(boolean adminOnly) {
     synchronized (existingSystemsLock) {
@@ -1783,7 +1783,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
 //    * @see #connect(Properties)
 //    * @see com.gemstone.gemfire.admin.SystemMembershipListener#memberJoined
 //    *
-//    * @since 4.0
+//    * @since GemFire 4.0
 //    */
 //   public static DistributedSystem connect(Properties config,
 //                                           Object callback) {
@@ -1820,7 +1820,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @throws IllegalStateException
    *                 This VM has {@linkplain #disconnect() disconnected} from
    *                 the distributed system.
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public abstract LogWriter getSecurityLogWriter();
 
@@ -1833,7 +1833,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
   /**
    * Returns the security specific configuration properties.
    * @return the configuration Properties
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public abstract Properties getSecurityProperties();
 
@@ -1883,7 +1883,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    *
    * @see com.gemstone.gemfire.admin.SystemMembershipEvent#getMemberId
    *
-   * @since 4.0
+   * @since GemFire 4.0
    * @deprecated as of GemFire 5.0, use {@link #getDistributedMember} instead
    */
   @Deprecated
@@ -1893,14 +1893,14 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * Returns the {@link DistributedMember} that identifies this connection to
    * the distributed system.
    * @return the member that represents this distributed system connection.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public abstract DistributedMember getDistributedMember();
   
   /**
    * Returns a set of all the other members in this distributed system.
    * @return returns a set of all the other members in this distributed system.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public abstract Set<DistributedMember> getAllOtherMembers();
 
@@ -1908,7 +1908,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * Returns a set of all the members in the given group.
    * Members join a group be setting the "groups" gemfire property.
    * @return returns a set of all the member in a group.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public abstract Set<DistributedMember> getGroupMembers(String group);
   
@@ -1919,7 +1919,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @return a set of all DistributedMembers that have any interfaces
    * that match the given IP address. May be empty if there are no members.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */ 
    public abstract Set<DistributedMember> findDistributedMembers(InetAddress address);
 
@@ -1929,7 +1929,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @return the distributed member that has the given name, or null if
    * no member is currently running with the given name.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */
    public abstract DistributedMember findDistributedMember(String name);
 
@@ -1961,7 +1961,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #PROPERTIES_FILE_DEFAULT
    * @see #getPropertiesFile()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final String PROPERTIES_FILE_PROPERTY = "gemfirePropertyFile";
   
@@ -1972,7 +1972,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #PROPERTIES_FILE_PROPERTY
    * @see #getPropertiesFile()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final String PROPERTIES_FILE_DEFAULT = "gemfire.properties";
 
@@ -1982,7 +1982,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #PROPERTIES_FILE_PROPERTY
    * @see #PROPERTIES_FILE_DEFAULT
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static String getPropertiesFile() {
 	return System.getProperty(PROPERTIES_FILE_PROPERTY, PROPERTIES_FILE_DEFAULT);
@@ -2009,7 +2009,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * done.
    * 
    * @see #getPropertiesFile()
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated As of 9.0, please use {@link #getPropertiesFile()} instead. 
    */
   public static String PROPERTY_FILE = getPropertiesFile();
@@ -2036,7 +2036,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #SECURITY_PROPERTIES_FILE_DEFAULT
    * @see #getSecurityPropertiesFile()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final String SECURITY_PROPERTIES_FILE_PROPERTY = "gemfireSecurityPropertyFile";
   
@@ -2047,7 +2047,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #SECURITY_PROPERTIES_FILE_PROPERTY
    * @see #getSecurityPropertiesFile()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static final String SECURITY_PROPERTIES_FILE_DEFAULT = "gfsecurity.properties";
 
@@ -2057,7 +2057,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * 
    * @see #SECURITY_PROPERTIES_FILE_PROPERTY
    * @see #SECURITY_PROPERTIES_FILE_DEFAULT
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static String getSecurityPropertiesFile() {
 	return System.getProperty(SECURITY_PROPERTIES_FILE_PROPERTY, SECURITY_PROPERTIES_FILE_DEFAULT);
@@ -2084,7 +2084,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * done.
    * 
    * @see #getSecurityPropertiesFile()
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    * @deprecated As of 9.0, please use {@link #getSecurityPropertiesFile()} instead. 
    */
   public static String SECURITY_PROPERTY_FILE = getSecurityPropertiesFile();
@@ -2101,7 +2101,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @see #PROPERTIES_FILE_PROPERTY
    * @see #PROPERTIES_FILE_DEFAULT
    * @see #getPropertiesFile()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public static URL getPropertiesFileURL() {
     return getFileURL(getPropertiesFile());
@@ -2117,7 +2117,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @return a <code>URL</code> that names the GemFire property file.
    *    Null is returned if no property file was found.
    * @see #getPropertiesFileURL()
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated As of 9.0, please use {@link #getPropertiesFileURL()}
    */
   public static URL getPropertyFileURL() {
@@ -2136,7 +2136,7 @@ public abstract class DistributedSystem implements StatisticsFactory {
    * @see #SECURITY_PROPERTIES_FILE_PROPERTY
    * @see #SECURITY_PROPERTIES_FILE_DEFAULT
    * @see #getSecurityPropertiesFile()
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static URL getSecurityPropertiesFileURL() {
     return getFileURL(getSecurityPropertiesFile());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemDisconnectedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemDisconnectedException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemDisconnectedException.java
index 9e5f4d3..2858780 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemDisconnectedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemDisconnectedException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a GemFire distributed system has been terminated.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class DistributedSystemDisconnectedException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/FutureCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/FutureCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/FutureCancelledException.java
index ab06198..42bb58c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/FutureCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/FutureCancelledException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a {@link Future} has been cancelled.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class FutureCancelledException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
index b4bce36..bfe25a1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/GatewayCancelledException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a GemFire oplog has been terminated.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class GatewayCancelledException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
index f089013..ddcc48a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/Locator.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * 
  * <P>
  *  
- * @since 4.0
+ * @since GemFire 4.0
  */
 public abstract class Locator {
 
@@ -78,7 +78,7 @@ public abstract class Locator {
 
   /**
    * the hostname to give to clients so they can connect to this locator.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected String hostnameForClients;
   
@@ -134,7 +134,7 @@ public abstract class Locator {
    * relied on for stable membership information. The locator will provide provide
    * peer and cache server location services.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    * 
    * @param port
    *                The port on which the locator will listen for membership
@@ -215,7 +215,7 @@ public abstract class Locator {
    * information. The locator will provide provide
    * peer and cache server location services.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    *
    * @param port
    *        The port on which the locator will listen for membership
@@ -264,7 +264,7 @@ public abstract class Locator {
    * information. The locator will provide provide
    * peer and cache server location services.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    *
    * @param port
    *        The port on which the locator will listen for membership
@@ -303,7 +303,7 @@ public abstract class Locator {
    * @throws IOException
    *         If the locator cannot be started
    *         
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static Locator startLocatorAndDS(
     int port,
@@ -391,7 +391,7 @@ public abstract class Locator {
    * Returns the locator if it exists in this JVM.
    * Otherwise returns null.
    * @return the locator that exists in this JVM; null if no locator.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Locator getLocator() {
     return InternalLocator.getLocator();
@@ -410,7 +410,7 @@ public abstract class Locator {
    * Returns true if a locator exists in this JVM.
    * 
    * @return true if a locator exists in this JVM.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static boolean hasLocator() {
     return InternalLocator.hasLocator();
@@ -447,7 +447,7 @@ public abstract class Locator {
    * Returns the hostname that will be given to clients so that they can
    * connect to this locator. Returns <code>null</code> if clients should
    * use the bind address.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getHostnameForClients() {
     String result = this.hostnameForClients;
@@ -538,7 +538,7 @@ public abstract class Locator {
    * to use to connect to this locator.
    * If unspecified, defaults to the bind-address.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static void main(String args[]) {
     com.gemstone.gemfire.internal.DistributionLocator.main(args);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index b9edb59..a0cfc4f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -78,7 +78,7 @@ import joptsimple.OptionSet;
  * 
  * @see com.gemstone.gemfire.distributed.AbstractLauncher
  * @see com.gemstone.gemfire.distributed.ServerLauncher
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings({ "unused" })
 public final class LocatorLauncher extends AbstractLauncher<String> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockNotHeldException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockNotHeldException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockNotHeldException.java
index 6e8b34a..7a52bee 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockNotHeldException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockNotHeldException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.distributed;
  * A <code>LockNotHeldException</code> is thrown when attempting
  * unlock a lock that is not held by the thread performing the unlock.
  *
- * @since     4.0
+ * @since GemFire     4.0
  */
 public class LockNotHeldException extends IllegalStateException {
 private static final long serialVersionUID = 3827860179805916215L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockServiceDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockServiceDestroyedException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockServiceDestroyedException.java
index e6b0038..db452bb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockServiceDestroyedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LockServiceDestroyedException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.distributed;
  * A <code>LockServiceDestroyedException</code> is thrown when attempting
  * use a distributed lock service that has been destroyed.
  *
- * @since     4.0
+ * @since GemFire     4.0
  */
 public class LockServiceDestroyedException extends IllegalStateException {
 private static final long serialVersionUID = 7528711924957352636L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
index e56fe4d..aa43f24 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/OplogCancelledException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a GemFire gateway has been terminated.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class OplogCancelledException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
index e6625d0..9eed2b7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/PoolCancelledException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a GemFire pool has been cancelled.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class PoolCancelledException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index a055862..c95e301 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -91,7 +91,7 @@ import joptsimple.OptionSet;
  * 
  * @see com.gemstone.gemfire.distributed.AbstractLauncher
  * @see com.gemstone.gemfire.distributed.LocatorLauncher
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings({ "unused" })
 public class ServerLauncher extends AbstractLauncher<String> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/TXManagerCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/TXManagerCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/TXManagerCancelledException.java
index bbbf98f..eedefd1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/TXManagerCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/TXManagerCancelledException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.CancelException;
 /**
  * Thrown when a GemFire transaction manager has been terminated.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class TXManagerCancelledException extends CancelException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 17e7c2b..ae11e5d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -389,7 +389,7 @@ public abstract class AbstractDistributionConfig
   }
 
 
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   @ConfigAttributeChecker(name=CLIENT_CONFLATION_PROP_NAME)
   protected String checkClientConflation(String value) {
     if (! (value.equals(CLIENT_CONFLATION_PROP_VALUE_DEFAULT) ||

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AtomicLongWithTerminalState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AtomicLongWithTerminalState.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AtomicLongWithTerminalState.java
index ce8ccf2..85286da 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AtomicLongWithTerminalState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AtomicLongWithTerminalState.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * become the special value accidentally. For example, a long that can never go
  * negative with normal use could have a terminal state of Long.MIN_VALUE
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class AtomicLongWithTerminalState extends AtomicLong {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ConflationKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ConflationKey.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ConflationKey.java
index a5881bc..5360ebc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ConflationKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/ConflationKey.java
@@ -22,7 +22,7 @@ import java.nio.ByteBuffer;
  * Used to uniquely identify a conflatable message. If two messages have
  * keys that are equal then the latter message can replace (i.e. conflate)
  * the earlier message.
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 public class ConflationKey {
   private final Object entryKey;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DM.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DM.java
index 405b169..a3741a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DM.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DM.java
@@ -57,7 +57,7 @@ public interface DM extends ReplySender {
 
   /**
    * Get a set of all other members (both admin ones and normal).
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set getAllOtherMembers();
 
@@ -70,14 +70,14 @@ public interface DM extends ReplySender {
   /**
    * removes members that have older versions from the given collection, typically
    * a Set from a distribution advisor
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public void retainMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members, Version version);
 
   /**
    * removes members that have the given version or later from the given collection,
    * typically a Set from a distribution advisor
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public void removeMembersWithSameOrNewerVersion(Collection<InternalDistributedMember> members, Version version);
 
@@ -97,7 +97,7 @@ public interface DM extends ReplySender {
   /**
    * Returns an unmodifiable set containing the identities of all of
    * the known distribution managers including admin members.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set getDistributionManagerIdsIncludingAdmin();
 
@@ -121,7 +121,7 @@ public interface DM extends ReplySender {
   /**
    * Add a membership listener for all members
    * and return other DistribtionManagerIds as an atomic operation
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Set addAllMembershipListenerAndGetAllIds(MembershipListener l);
 
@@ -134,7 +134,7 @@ public interface DM extends ReplySender {
    * Return true if no other distribution manager was in this group
    * when he joined.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isAdam();
   /**
@@ -143,13 +143,13 @@ public interface DM extends ReplySender {
    * Note that this method may return null (no valid elders exist).
    * 
    * @return the elder member, possibly null
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public InternalDistributedMember getElderId();
   /**
    * Return true if this is the oldest DM in this group.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public boolean isElder();
   
@@ -167,7 +167,7 @@ public interface DM extends ReplySender {
    * @param force if true then this DM must become the elder.
    * @param useTryLock if true then a try-lock will be used
    * @throws IllegalStateException if elder try lock fails
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public ElderState getElderState(boolean force, boolean useTryLock);
   
@@ -175,7 +175,7 @@ public interface DM extends ReplySender {
    * Returns the id of the underlying distribution channel used for
    * communication.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public long getChannelId();
 
@@ -231,7 +231,7 @@ public interface DM extends ReplySender {
    * @throws IllegalArgumentException
    *         <code>l</code> was not registered on this distribution
    *         manager
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void removeAllMembershipListener(MembershipListener l);
 
@@ -242,7 +242,7 @@ public interface DM extends ReplySender {
   /**
    * Used to get the DistributionConfig so that Connection can
    * figure out if it is configured for async comms.
-   * @since 4.2.1
+   * @since GemFire 4.2.1
    */
   public DistributionConfig getConfig();
   
@@ -356,7 +356,7 @@ public interface DM extends ReplySender {
   /**
    * Return all members that are on the the this host 
    * @return set of {@link InternalDistributedMember} including this VM
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public Set <InternalDistributedMember> getMembersInThisZone();
   
@@ -403,7 +403,7 @@ public interface DM extends ReplySender {
    * locators.
    * @param isSharedConfigurationEnabled flag to determine if the locator has enabled shared configuration
    * 
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public void addHostedLocators(InternalDistributedMember member, Collection<String> locators, boolean isSharedConfigurationEnabled);
   
@@ -416,7 +416,7 @@ public interface DM extends ReplySender {
    * This currently only tracks stand-alone/dedicated locators, not embedded
    * locators.
    * 
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public Collection<String> getHostedLocators(InternalDistributedMember member);
   
@@ -428,7 +428,7 @@ public interface DM extends ReplySender {
    * This currently only tracks stand-alone/dedicated locators, not embedded
    * locators.
    * 
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public Map<InternalDistributedMember, Collection<String>> getAllHostedLocators();
 
@@ -440,7 +440,7 @@ public interface DM extends ReplySender {
    * This currently only tracks stand-alone/dedicated locators, not embedded
    * locators.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public Map<InternalDistributedMember, Collection<String>> getAllHostedLocatorsWithSharedConfiguration();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DMStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DMStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DMStats.java
index 1251c26..1b36ee1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DMStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DMStats.java
@@ -185,7 +185,7 @@ public interface DMStats {
   /**
    * increments
    * the number of unicast writes performed and the number of bytes written
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void incUcastWriteBytes(int bytesWritten);
   /**
@@ -237,63 +237,63 @@ public interface DMStats {
   /**
    * Increments the number of message replies that have timed out
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void incReplyTimeouts();
 
   /**
    * Returns the number of message replies that have timed out
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public long getReplyTimeouts();
 
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void incReceivers();
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void decReceivers();
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void incFailedAccept();
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void incFailedConnect();
   /**
-   * @since 4.1.1
+   * @since GemFire 4.1.1
    */
   public void incReconnectAttempts();
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void incLostLease();
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void incSenders(boolean shared, boolean preserveOrder);
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void decSenders(boolean shared, boolean preserveOrder);
   /**
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public int getSendersSU();
   /**
    * increment the number of unicast UDP retransmission requests received from
    * other processes
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void incUcastRetransmits();
   /**
    * increment the number of multicast UDP retransmissions sent to
    * other processes
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void incMcastRetransmits();
   /**
@@ -304,182 +304,182 @@ public interface DMStats {
   /**
    * increment the number of multicast UDP retransmission requests sent to
    * other processes
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void incMcastRetransmitRequests();
 
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncSocketWritesInProgress();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncSocketWrites();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncSocketWriteRetries();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncSocketWriteBytes();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncSocketWriteTime();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncQueues();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueues(int inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncQueueFlushesInProgress();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncQueueFlushesCompleted();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncQueueFlushTime();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long startAsyncQueueFlush();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void endAsyncQueueFlush(long start);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncQueueTimeouts();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueueTimeouts(int inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncQueueSizeExceeded();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueueSizeExceeded(int inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncDistributionTimeoutExceeded();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncDistributionTimeoutExceeded();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncQueueSize();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueueSize(long inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncQueuedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueuedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncDequeuedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncDequeuedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncConflatedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncConflatedMsgs();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncThreads();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncThreads(int inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncThreadInProgress();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public int getAsyncThreadCompleted();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncThreadTime();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long startAsyncThread();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void endAsyncThread(long start);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncQueueAddTime();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueueAddTime(long inc);
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public long getAsyncQueueRemoveTime();
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   public void incAsyncQueueRemoveTime(long inc);
 
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public void incReceiverBufferSize(int inc, boolean direct);
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public void incSenderBufferSize(int inc, boolean direct);
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public long startSocketLock();
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public void endSocketLock(long start);
 
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public long startBufferAcquire();
   /**
-   * @since 5.0.2.4 
+   * @since GemFire 5.0.2.4
    */
   public void endBufferAcquire(long start);
 
@@ -496,13 +496,13 @@ public interface DMStats {
    * @param newMsg true if a new message being received was detected; false if
    *   this is just additional data for a message already detected.
    * @param bytes the number of bytes read, so far, for the message being received. 
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public void incMessagesBeingReceived(boolean newMsg, int bytes);
   /**
    * Called when we finish processing a received message.
    * @param bytes the number of bytes read off the wire for the message we have finished with.
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public void decMessagesBeingReceived(int bytes);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DSClock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DSClock.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DSClock.java
index 0e69e37..ff92d55 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DSClock.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DSClock.java
@@ -102,7 +102,7 @@ public class DSClock {
 
   /**
    * @return Offset for system time, calculated by distributed system coordinator.
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public long getCacheTimeOffset() {
     return this.cacheTimeDelta;
@@ -112,7 +112,7 @@ public class DSClock {
    * Sets the deviation of this process's local time from the rest of the GemFire
    * distributed system.
    *
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public void setCacheTimeOffset(DistributedMember coord, long offset, boolean isJoin) {
     if (Boolean.getBoolean("gemfire.disable-distributed-clock")) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisee.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisee.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisee.java
index d57cdc7..655b9d1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisee.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisee.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile;
 
 /**
  * Resource which uses a {@link DistributionAdvisor}.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface DistributionAdvisee {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMember.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMember.java
index 72db890..2667b3d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMember.java
@@ -23,7 +23,7 @@ import java.net.InetAddress;
 /**
  * Administrative interface for monitoring a GemFire system member.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
@@ -100,7 +100,7 @@ public interface SystemMember {
    *
    *@param statisticsTypeName String ame of the Statistics Type
    * @return array of runtime statistic resources owned by this member
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public StatisticResource[] getStat(String statisticsTypeName) throws com.gemstone.gemfire.admin.AdminException;
   
@@ -131,7 +131,7 @@ public interface SystemMember {
    * Returns the names of the membership roles filled by this member.
    *
    * @return array of string membership role names
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public String[] getRoles();
   
@@ -140,7 +140,7 @@ public interface SystemMember {
    * that represents this system member.
    *
    * @return DistributedMember instance representing this system member
-   * @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/admin/SystemMemberBridgeServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
index eb4d715..bc95925 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberBridgeServer.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.server.ServerLoadProbe;
  *
  * @see SystemMemberCache#addCacheServer
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 5.7 use {@link SystemMemberCacheServer} instead.
  */
 @Deprecated
@@ -75,7 +75,7 @@ public interface SystemMemberBridgeServer {
    * Returns a string representing the ip address or host name that this server
    * will listen on.
    * @return the ip address or host name that this server is to listen on
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getBindAddress();
   /**
@@ -92,7 +92,7 @@ public interface SystemMemberBridgeServer {
    * addresses then use this string <code>"0.0.0.0"</code>.
    * @param address the ip address or host name that this server is to listen on
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setBindAddress(String address) throws AdminException;
   /**
@@ -100,7 +100,7 @@ public interface SystemMemberBridgeServer {
    * will tell clients that this server is listening on.
    * @return the ip address or host name to give to clients so they can connect
    *         to this server
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getHostnameForClients();
   /**
@@ -113,7 +113,7 @@ public interface SystemMemberBridgeServer {
    * @param name the ip address or host name that will be given to clients
    *   so they can connect to this server
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setHostnameForClients(String name) throws AdminException;
   /**
@@ -132,14 +132,14 @@ public interface SystemMemberBridgeServer {
    * pushed to the client. The client does not need to request the new value
    * from the bridge server.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setNotifyBySubscription(boolean b) throws AdminException;
 
   /**
    * Answers whether or not this bridge server should notify clients based on
    * key subscription.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean getNotifyBySubscription();
 
@@ -149,7 +149,7 @@ public interface SystemMemberBridgeServer {
    *
    * @param socketBufferSize The size in bytes of the socket buffer
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setSocketBufferSize(int socketBufferSize) throws AdminException;
 
@@ -158,7 +158,7 @@ public interface SystemMemberBridgeServer {
    * <code>BridgeServer</code>. The default is 32768 bytes.
    * @return the configured buffer size of the socket connection for this
    * <code>BridgeServer</code>
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getSocketBufferSize();
 
@@ -170,7 +170,7 @@ public interface SystemMemberBridgeServer {
    * @param maximumTimeBetweenPings The maximum amount of time between client
    * pings
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
 
@@ -179,13 +179,13 @@ public interface SystemMemberBridgeServer {
    * used by the <code>ClientHealthMonitor</code> to determine the health
    * of this <code>BridgeServer</code>'s clients. The default is 60000 ms.
    * @return the maximum amount of time between client pings.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaximumTimeBetweenPings();
 
   /** 
    *  Returns the maximum allowed client connections
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaxConnections();
 
@@ -194,7 +194,7 @@ public interface SystemMemberBridgeServer {
    * When the maximum is reached the server will stop accepting
    * connections.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaxConnections(int maxCons) throws AdminException;
 
@@ -203,7 +203,7 @@ public interface SystemMemberBridgeServer {
    * client requests.
    * The default of <code>0</code> causes the server to dedicate a thread for
    * every client connection.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaxThreads();
 
@@ -213,28 +213,28 @@ public interface SystemMemberBridgeServer {
    * The default of <code>0</code> causes the server to dedicate a thread for
    * every client connection.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaxThreads(int maxThreads) throws AdminException;
 
   /**
    * Returns the maximum number of messages that can be enqueued in a
    * client-queue.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaximumMessageCount();
 
   /**
    * Sets maximum number of messages that can be enqueued in a client-queue.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaximumMessageCount(int maxMessageCount) throws AdminException;
   
   /**
    * Returns the time (in seconds ) after which a message in the client queue
    * will expire.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMessageTimeToLive();
 
@@ -242,7 +242,7 @@ public interface SystemMemberBridgeServer {
    * Sets the time (in seconds ) after which a message in the client queue
    * will expire.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
   /**
@@ -252,7 +252,7 @@ public interface SystemMemberBridgeServer {
    * @param groups possibly empty array of <code>String</code> where each string
    * is a server groups that this bridge server will be a member of.
    * @throws AdminException if this bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setGroups(String[] groups) throws AdminException;
   /**
@@ -260,7 +260,7 @@ public interface SystemMemberBridgeServer {
    * @return a possibly empty array of <code>String</code>s where
    * each string is a server group. Modifying this array will not change the
    * server groups that this bridge server belongs to.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String[] getGroups();
   
@@ -269,7 +269,7 @@ public interface SystemMemberBridgeServer {
    * {@link ServerLoadProbe} for details on the load probe.
    * @return the load probe used by this bridge
    * server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getLoadProbe();
 
@@ -284,7 +284,7 @@ public interface SystemMemberBridgeServer {
    * @param loadProbe the load probe to use for
    * this bridge server.
    * @throws AdminException  if the bridge server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
index 654812d..8c178dd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCache.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
  * Administrative interface that represent's the {@link SystemMember}'s view
  * of its {@link com.gemstone.gemfire.cache.Cache}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberCache {
@@ -136,7 +136,7 @@ public interface SystemMemberCache {
    * @throws AdminException
    *         If the region cannot be created
    *
-   * @since 4.0
+   * @since GemFire 4.0
    * @deprecated as of GemFire 5.0, use {@link #createRegion} instead
    */
   @Deprecated
@@ -155,7 +155,7 @@ public interface SystemMemberCache {
    * @throws AdminException
    *         If the region cannot be created
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public SystemMemberRegion createRegion(String name,
                                          RegionAttributes attrs)
@@ -173,7 +173,7 @@ public interface SystemMemberCache {
    *
    * @see com.gemstone.gemfire.cache.Cache#addCacheServer
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public SystemMemberCacheServer addCacheServer()
     throws AdminException;
@@ -185,7 +185,7 @@ public interface SystemMemberCache {
    *
    * @see com.gemstone.gemfire.cache.Cache#getCacheServers
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public SystemMemberCacheServer[] getCacheServers()
     throws AdminException;
@@ -197,7 +197,7 @@ public interface SystemMemberCache {
    * CacheServer}.  Note that this value will not be updated until
    * {@link #refresh} is invoked.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean isServer() throws AdminException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheEvent.java
index 527ba9b..4b1454c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheEvent.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Operation;
  * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
  * a cache is created or closed.
  *
- * @since 5.0
+ * @since GemFire 5.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberCacheEvent extends SystemMembershipEvent {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheListener.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheListener.java
index 416adca..b46bdf0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.*;
  * @see AdminDistributedSystem#addCacheListener
  * @see AdminDistributedSystem#removeCacheListener
  *
- * @since 5.0 
+ * @since GemFire 5.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberCacheListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheServer.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheServer.java
index 0e3ab12..86097bb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberCacheServer.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.server.ServerLoadProbe;
  *
  * @see SystemMemberCache#addCacheServer
  *
- * @since 5.7
+ * @since GemFire 5.7
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberCacheServer {
@@ -75,7 +75,7 @@ public interface SystemMemberCacheServer {
    * Returns a string representing the ip address or host name that this server
    * will listen on.
    * @return the ip address or host name that this server is to listen on
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getBindAddress();
   /**
@@ -92,7 +92,7 @@ public interface SystemMemberCacheServer {
    * addresses then use this string <code>"0.0.0.0"</code>.
    * @param address the ip address or host name that this server is to listen on
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setBindAddress(String address) throws AdminException;
   /**
@@ -100,7 +100,7 @@ public interface SystemMemberCacheServer {
    * will tell clients that this server is listening on.
    * @return the ip address or host name to give to clients so they can connect
    *         to this server
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getHostnameForClients();
   /**
@@ -113,7 +113,7 @@ public interface SystemMemberCacheServer {
    * @param name the ip address or host name that will be given to clients
    *   so they can connect to this server
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setHostnameForClients(String name) throws AdminException;
   /**
@@ -132,14 +132,14 @@ public interface SystemMemberCacheServer {
    * pushed to the client. The client does not need to request the new value
    * from the cache server.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setNotifyBySubscription(boolean b) throws AdminException;
 
   /**
    * Answers whether or not this cache server should notify clients based on
    * key subscription.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean getNotifyBySubscription();
 
@@ -149,7 +149,7 @@ public interface SystemMemberCacheServer {
    *
    * @param socketBufferSize The size in bytes of the socket buffer
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setSocketBufferSize(int socketBufferSize) throws AdminException;
 
@@ -158,7 +158,7 @@ public interface SystemMemberCacheServer {
    * <code>CacheServer</code>. The default is 32768 bytes.
    * @return the configured buffer size of the socket connection for this
    * <code>CacheServer</code>
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getSocketBufferSize();
 
@@ -170,7 +170,7 @@ public interface SystemMemberCacheServer {
    * @param maximumTimeBetweenPings The maximum amount of time between client
    * pings
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
 
@@ -179,13 +179,13 @@ public interface SystemMemberCacheServer {
    * used by the <code>ClientHealthMonitor</code> to determine the health
    * of this <code>CacheServer</code>'s clients. The default is 60000 ms.
    * @return the maximum amount of time between client pings.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaximumTimeBetweenPings();
 
   /** 
    *  Returns the maximum allowed client connections
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaxConnections();
 
@@ -194,7 +194,7 @@ public interface SystemMemberCacheServer {
    * When the maximum is reached the server will stop accepting
    * connections.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaxConnections(int maxCons) throws AdminException;
 
@@ -203,7 +203,7 @@ public interface SystemMemberCacheServer {
    * client requests.
    * The default of <code>0</code> causes the server to dedicate a thread for
    * every client connection.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaxThreads();
 
@@ -213,28 +213,28 @@ public interface SystemMemberCacheServer {
    * The default of <code>0</code> causes the server to dedicate a thread for
    * every client connection.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaxThreads(int maxThreads) throws AdminException;
 
   /**
    * Returns the maximum number of messages that can be enqueued in a
    * client-queue.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMaximumMessageCount();
 
   /**
    * Sets maximum number of messages that can be enqueued in a client-queue.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMaximumMessageCount(int maxMessageCount) throws AdminException;
   
   /**
    * Returns the time (in seconds ) after which a message in the client queue
    * will expire.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getMessageTimeToLive();
 
@@ -242,7 +242,7 @@ public interface SystemMemberCacheServer {
    * Sets the time (in seconds ) after which a message in the client queue
    * will expire.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
   /**
@@ -252,7 +252,7 @@ public interface SystemMemberCacheServer {
    * @param groups possibly empty array of <code>String</code> where each string
    * is a server groups that this cache server will be a member of.
    * @throws AdminException if this cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setGroups(String[] groups) throws AdminException;
   /**
@@ -260,7 +260,7 @@ public interface SystemMemberCacheServer {
    * @return a possibly empty array of <code>String</code>s where
    * each string is a server group. Modifying this array will not change the
    * server groups that this cache server belongs to.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String[] getGroups();
   
@@ -269,7 +269,7 @@ public interface SystemMemberCacheServer {
    * {@link ServerLoadProbe} for details on the load probe.
    * @return the load probe used by this cache
    * server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getLoadProbe();
 
@@ -284,7 +284,7 @@ public interface SystemMemberCacheServer {
    * @param loadProbe the load probe to use for
    * this cache server.
    * @throws AdminException  if the cache server is running
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
index fff825a..b55c21f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegion.java
@@ -27,7 +27,7 @@ import java.io.File;
  * <code>SystemMemberRegion</code> will throw {@link
  * RegionNotFoundException}.
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberRegion {
@@ -100,7 +100,7 @@ public interface SystemMemberRegion {
    * CacheListeners
    * 
    * @return String[] the region's <code>CacheListeners</code> as a String array
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public String[] getCacheListeners();
 
@@ -270,7 +270,7 @@ public interface SystemMemberRegion {
    * @return False if acks are sent after updates are processed;
    *         true if acks are sent before updates are processed.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public boolean getEarlyAck();
 
@@ -292,7 +292,7 @@ public interface SystemMemberRegion {
    * @throws AdminException
    *         If the region cannot be created
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public SystemMemberRegion createSubregion(String name,
                                             RegionAttributes attrs)
@@ -307,13 +307,13 @@ public interface SystemMemberRegion {
   
   /**
    * Returns the <code>SubscriptionAttributes</code> for the region.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public SubscriptionAttributes getSubscriptionAttributes();
   
   /**
    * Returns the <code>PartitionAttributes</code> for the region.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public PartitionAttributes getPartitionAttributes();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegionEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegionEvent.java
index d6e19b2..c391263 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegionEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberRegionEvent.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
  * a region comes or goes.
  *
- * @since 5.0
+ * @since GemFire 5.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMemberRegionEvent extends SystemMemberCacheEvent {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberType.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberType.java
index 1dbb206..1e3e1aa 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMemberType.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
 /**
  * Type-safe definition for system members.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipEvent.java
index be710c9..c428043 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipEvent.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * Instances of this are delivered to a {@link SystemMembershipListener} when a
  * member has joined or left the distributed system.
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMembershipEvent {
@@ -34,7 +34,7 @@ public interface SystemMembershipEvent {
   /**
    * 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/admin/SystemMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipListener.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipListener.java
index 3502bae..a8b8b3d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/SystemMembershipListener.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see AdminDistributedSystem#addMembershipListener
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface SystemMembershipListener {
@@ -54,7 +54,7 @@ public interface SystemMembershipListener {
 //    *
 //    * @see com.gemstone.gemfire.distributed.DistributedSystem#fireInfoEvent
 //    *
-//    * @since 4.0
+//    * @since GemFire 4.0
 //    */
 //   public void memberInfo(SystemMembershipEvent event);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/UnmodifiableConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/UnmodifiableConfigurationException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/UnmodifiableConfigurationException.java
index 4217508..a73b0bf 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/UnmodifiableConfigurationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/UnmodifiableConfigurationException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  * is made to modify the value of an unmodifiable 
  * {@link ConfigurationParameter}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AbstractHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AbstractHealthEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AbstractHealthEvaluator.java
index 87758fe..4b6505f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AbstractHealthEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AbstractHealthEvaluator.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * aren't meant to be.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * */
 public abstract class AbstractHealthEvaluator  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 2522a0f..4a78c0a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -88,7 +88,7 @@ import com.gemstone.gemfire.internal.util.concurrent.FutureResult;
 /**
  * Represents a GemFire distributed system for remote administration/management.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class AdminDistributedSystemImpl
 implements com.gemstone.gemfire.admin.AdminDistributedSystem,
@@ -950,7 +950,7 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
    * Returns the internal admin API's agent used for administering
    * this <code>AdminDistributedSystem</code>.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public GfManagerAgent getAdminAgent() {
     return this.gfManagerAgent;
@@ -1303,7 +1303,7 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
    * @return constructed SystemMember instance
    * @throws com.gemstone.gemfire.admin.AdminException
    *           if construction of SystemMember instance fails
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected SystemMember createSystemMember(InternalDistributedMember member)
     throws com.gemstone.gemfire.admin.AdminException {
@@ -2017,7 +2017,7 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
    * @return array of CacheServer(s) having the queue for the durable client
    * @throws AdminException
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public CacheServer[] getCacheServers(String durableClientId)
       throws AdminException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthConfigImpl.java
index ed904ca..59be648 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthConfigImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.admin.*;
  * The implementation of <code>CacheHealthConfig</code>
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public abstract class CacheHealthConfigImpl
   extends MemberHealthConfigImpl implements CacheHealthConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluator.java
index 4ba1b9c..67f39f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluator.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * a {@link CacheHealthConfig}.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 class CacheHealthEvaluator extends AbstractHealthEvaluator 
   implements CacheLifecycleListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
index 8f75a62..225b4de 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.admin.GemFireVM;
 /**
  * An implementation of <code>CacheVmConfig</code>
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CacheServerConfigImpl extends ManagedEntityConfigImpl 
   implements CacheVmConfig, CacheServerConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
index 400777c..8a3d707 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /**
  * Implements the administrative interface to a cache server.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class CacheServerImpl extends ManagedSystemMemberImpl
   implements CacheVm, CacheServer {
@@ -183,7 +183,7 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
    *                durable-id of the client
    * @return true if the server is primary for given client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean isPrimaryForDurableClient(String durableClientId)
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterImpl.java
index 604fe71..a6f86c5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * A single configuration parameter of a system member.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class ConfigurationParameterImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterListener.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterListener.java
index a9d0c91..c2f23e4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ConfigurationParameterListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.admin.ConfigurationParameter;
  * configuration changes made through 
  * {@link ConfigurationParameterImpl#setValue}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public interface ConfigurationParameterListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index 646ed20..b3e49e8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender;
  * <code>AdminDistributedSystem</code> associated with this
  * configuration object.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class DistributedSystemConfigImpl 
   implements DistributedSystemConfig {
@@ -111,7 +111,7 @@ public class DistributedSystemConfigImpl
   /** The admin distributed system object that is configured by this
    * config object. 
    *
-   * @since 4.0 */
+   * @since GemFire 4.0 */
   private AdminDistributedSystemImpl system;
 
   /** The GemFire log writer used by the distributed system */
@@ -125,7 +125,7 @@ public class DistributedSystemConfigImpl
    * <code>DistributedSystemConfig</code> that are not present in the
    * internal <code>DistributionConfig</code>.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private static Properties
     filterOutAdminProperties(Properties props) { 
@@ -197,7 +197,7 @@ public class DistributedSystemConfigImpl
   /**
    * Zero-argument constructor to be used only by subclasses.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected DistributedSystemConfigImpl() {
 
@@ -222,7 +222,7 @@ public class DistributedSystemConfigImpl
    *          whether to skip loading distributed system properties from
    *          gemfire.properties file
    *          
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected DistributedSystemConfigImpl(Properties props, 
                                         boolean ignoreGemFirePropsFile) {
@@ -258,7 +258,7 @@ public class DistributedSystemConfigImpl
    * the distributed system. Returns null if nothing has been provided via
    * <code>setInternalLogWriter</code>.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public InternalLogWriter getInternalLogWriter() {
     // LOG: used only for sharing between IDS, AdminDSImpl and AgentImpl -- to prevent multiple banners, etc.
@@ -312,7 +312,7 @@ public class DistributedSystemConfigImpl
    * config object will result in a {@link IllegalStateException}
    * being thrown.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   void setDistributedSystem(AdminDistributedSystemImpl system) {
     this.system = system;
@@ -322,7 +322,7 @@ public class DistributedSystemConfigImpl
    * Checks to see if this config object is "read only".  If it is,
    * then an {@link IllegalStateException} is thrown.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected void checkReadOnly() {
     if (this.system != null) {
@@ -689,7 +689,7 @@ public class DistributedSystemConfigImpl
    * Returns an array of configurations for statically known
    * CacheServers
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */ 
   public CacheServerConfig[] getCacheServerConfigs() {
     return (CacheServerConfig[]) this.cacheServerConfigs.toArray(
@@ -703,7 +703,7 @@ public class DistributedSystemConfigImpl
   /** 
    * Creates the configuration for a CacheServer
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public CacheServerConfig createCacheServerConfig() {
     CacheServerConfig config = new CacheServerConfigImpl();
@@ -717,7 +717,7 @@ public class DistributedSystemConfigImpl
   /** 
    * Adds the configuration for a CacheServer
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private void addCacheServerConfig(CacheServerConfig managerConfig) {
     checkReadOnly();
@@ -736,7 +736,7 @@ public class DistributedSystemConfigImpl
   /** 
    * Removes the configuration for a CacheServer
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void removeCacheServerConfig(CacheServerConfig managerConfig) {
     removeCacheVmConfig((CacheVmConfig)managerConfig);
@@ -908,7 +908,7 @@ public class DistributedSystemConfigImpl
    * 
    * 
    * @return the gfSecurityProperties
-   * @since 6.6.3
+   * @since GemFire 6.6.3
    */
   public Properties getGfSecurityProperties() {
     return gfSecurityProperties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthConfigImpl.java
index 111fa6e..25ee3e3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthConfigImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.admin.*;
  * GemFireHealthConfigImpl} class hierarchy.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class DistributedSystemHealthConfigImpl
   implements DistributedSystemHealthConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthEvaluator.java
index f657ea4..013f0c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthEvaluator.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * system.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * */
 class DistributedSystemHealthEvaluator
   extends AbstractHealthEvaluator implements MembershipListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
index 59b43db..54e7de7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemHealthMonitor.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * special-case code.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * */
 class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
index 592c6c7..9abfd57 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
@@ -29,7 +29,7 @@ import java.util.Properties;
  * Provides an implementation of
  * <code>DistributionLocatorConfig</code>.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class DistributionLocatorConfigImpl 
   extends ManagedEntityConfigImpl 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorImpl.java
index ba0816d..58952c2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorImpl.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Default administrative implementation of a DistributionLocator.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class DistributionLocatorImpl
   implements DistributionLocator, InternalManagedEntity {
@@ -100,7 +100,7 @@ public class DistributionLocatorImpl
   /**
    * Returns the configuration object for this locator.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public DistributionLocatorConfig getConfig() {
     return this.config;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index 7618a95..536ffb1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * This class is a refactoring of <code>Systemcontroller</code>,
  * <code>RemoteCommand</code>, and <code>LocatorRemoteCommand</code>.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 class EnabledManagedEntityController implements ManagedEntityController {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthConfigImpl.java
index ddef2e6..11122d3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthConfigImpl.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  *
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class GemFireHealthConfigImpl
   extends CacheHealthConfigImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthEvaluator.java
index da9611f..ddd1358 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthEvaluator.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * @see CacheHealthEvaluator
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class GemFireHealthEvaluator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthImpl.java
index 24684eb..f8ae44a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/GemFireHealthImpl.java
@@ -34,7 +34,7 @@ import java.util.*;
  * is calcualted.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class GemFireHealthImpl
   implements GemFireHealth, JoinLeaveListener, HealthListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
index 767618c..43d8e44 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InetAddressUtil.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * Provides static utilities for manipulating, validating, and converting
  * InetAddresses and host strings.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 @Deprecated
 public class InetAddressUtil {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InternalManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InternalManagedEntity.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InternalManagedEntity.java
index fa602bc..4ead1df 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InternalManagedEntity.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/InternalManagedEntity.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.admin.ManagedEntityConfig;
  * <code>ManagedEntity<code>s.  This functionality is used by the
  * {@link ManagedEntityController} to manage the entity.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface InternalManagedEntity extends ManagedEntity {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
index af289d6..69751e9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigImpl.java
@@ -33,7 +33,7 @@ import java.net.*;
  * It contains configuration state and behavior common to all managed
  * entities.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public abstract class ManagedEntityConfigImpl
   implements ManagedEntityConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
index 17c4263..321bce6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
@@ -27,7 +27,7 @@ import java.io.*;
  * com.gemstone.gemfire.admin.DistributedSystemConfig} and vice versa.
  * It provides helper methods and constants.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlGenerator.java
index 36111f4..e406ba3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlGenerator.java
@@ -35,7 +35,7 @@ import java.util.*;
  * <code>AdminDistributedSystem</code>.  This class is used mainly for
  * testing.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ManagedEntityConfigXmlGenerator
   extends ManagedEntityConfigXml implements XMLReader {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlParser.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlParser.java
index 1276324..58e90e9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXmlParser.java
@@ -31,7 +31,7 @@ import java.util.*;
  * Parses an XML file and configures a {@link DistributedSystemConfig}
  * from it.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ManagedEntityConfigXmlParser
   extends ManagedEntityConfigXml implements ContentHandler {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
index 5828f5c..678ae8e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.admin.GemFireVM;
  * reflectively (for MBean operations) on instances of its
  * subclasses. 
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
   implements InternalManagedEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthConfigImpl.java
index 3f15ebc..08fd5a0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthConfigImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.admin.*;
  * The implementation of <code>MemberHealthConfig</code>
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public abstract class MemberHealthConfigImpl
   implements MemberHealthConfig, java.io.Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluator.java
index 31f3a37..d0710ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluator.java
@@ -37,7 +37,7 @@ import java.util.*;
  * @see DMStats
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticImpl.java
index e86f172..8ab39eb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.admin.Stat;
 /**
  * Implementation of a single statistic in a <code>StatisticResource</code>
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class StatisticImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticResourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticResourceImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticResourceImpl.java
index 9102586..e8054d0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticResourceImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/StatisticResourceImpl.java
@@ -32,7 +32,7 @@ import java.util.List;
 /**
  * Provides monitoring of a statistic resource.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class StatisticResourceImpl 
 implements com.gemstone.gemfire.admin.StatisticResource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberBridgeServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberBridgeServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberBridgeServerImpl.java
index 99f1a02..0c7e941 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberBridgeServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberBridgeServerImpl.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /**
  * Implementation of an object used for managing cache servers.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class SystemMemberBridgeServerImpl
   implements SystemMemberCacheServer, SystemMemberBridgeServer {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventImpl.java
index 7671192..9907234 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.Operation;
  * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
  * a cache is created or closed.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class SystemMemberCacheEventImpl
   extends SystemMembershipEventImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventProcessor.java
index 4532e38..df3d83e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheEventProcessor.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * This class processes the message to be delivered to admin node.
  * [This needs to be redesigned and reimplemented... see 32887]
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class SystemMemberCacheEventProcessor {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
index aa77b66..ec7650c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberCacheImpl.java
@@ -28,7 +28,7 @@ import java.util.*;
 /**
  * View of a GemFire system member's cache.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class SystemMemberCacheImpl implements SystemMemberCache {
   protected final GemFireVM vm;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberImpl.java
index 7533a8a..3584e58 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberImpl.java
@@ -52,7 +52,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Member of a GemFire system.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class SystemMemberImpl 
 implements com.gemstone.gemfire.admin.SystemMember,
@@ -134,7 +134,7 @@ implements com.gemstone.gemfire.admin.SystemMember,
    * @throws AdminException
    *           if construction of SystemMember fails
    *           
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected SystemMemberImpl(AdminDistributedSystem system,
                           InternalDistributedMember member) 
@@ -430,7 +430,7 @@ implements com.gemstone.gemfire.admin.SystemMember,
    * @param member
    *          InternalDistributedMember instance to update this SystemMember
    *          
-   * @since 6.5
+   * @since GemFire 6.5
    */
   private void updateByInternalDistributedMember(
       InternalDistributedMember member) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionEventImpl.java
index fa0f9b7..931d67a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionEventImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.Operation;
  * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
  * a region comes or goes.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class SystemMemberRegionEventImpl
   extends SystemMemberCacheEventImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionImpl.java
index 6c3bf0a..c1655f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMemberRegionImpl.java
@@ -28,7 +28,7 @@ import java.util.*;
 /**
  * View of a region in a GemFire system member's cache.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class SystemMemberRegionImpl implements SystemMemberRegion {
 
@@ -236,7 +236,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
    * 
    * @return String[] the region's <code>CacheListeners</code> descriptions as a
    *         String array
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public String[] getCacheListeners() {
     Object[] o = this.ra.getCacheListeners();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMembershipEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMembershipEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMembershipEventImpl.java
index 4d1cc38..ebc5270 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMembershipEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/SystemMembershipEventImpl.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * An event delivered to a {@link SystemMembershipListener} when a
  * member has joined or left the distributed system.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class SystemMembershipEventImpl implements SystemMembershipEvent {
 
@@ -56,7 +56,7 @@ public class SystemMembershipEventImpl implements SystemMembershipEvent {
 //    * <code>null</code> for the event delivered to the {@link
 //    * SystemMembershipListener#memberCrashed} method.
 //    *
-//    * @since 4.0
+//    * @since GemFire 4.0
 //    */
 //   public Object getCallbackArgument() {
 //     throw new UnsupportedOperationException("Not implemented yet");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/Agent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/Agent.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/Agent.java
index 1723735..f4139eb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/Agent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/Agent.java
@@ -66,7 +66,7 @@ import javax.management.ObjectName;
  * @see AgentConfig
  * @see AgentFactory
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface Agent {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentConfig.java
index 869a352..1f1e187 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentConfig.java
@@ -272,7 +272,7 @@ import com.gemstone.gemfire.admin.DistributedSystemConfig;
  * </dl>
  * 
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface AgentConfig extends DistributedSystemConfig {
@@ -413,7 +413,7 @@ public interface AgentConfig extends DistributedSystemConfig {
   /** 
    * The name of the "rmi-server-port" property
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final String RMI_SERVER_PORT_NAME = "rmi-server-port";
 
@@ -421,7 +421,7 @@ public interface AgentConfig extends DistributedSystemConfig {
    * The default value of the {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} 
    * property (0)
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final int DEFAULT_RMI_SERVER_PORT = 0;
 
@@ -656,7 +656,7 @@ public interface AgentConfig extends DistributedSystemConfig {
    * See <a href="#rmi-server-port">description</a> above.
    * 
    * @return the value set for rmi-server-port
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public int getRmiServerPort();
 
@@ -666,7 +666,7 @@ public interface AgentConfig extends DistributedSystemConfig {
    * See <a href="#rmi-server-port">description</a> above.
    * 
    * @param port rmi-server-port to set. 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setRmiServerPort(int port);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentFactory.java
index a0244be..72a7ba6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/AgentFactory.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.admin.jmx.internal.AgentImpl;
 /**
  * A factory class that creates JMX administration entities.
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class AgentFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AdminDistributedSystemJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
index a0ffef9..858ed71 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
@@ -101,7 +101,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * DistributedSystemImpl. Wrap all delegate calls w/ e.printStackTrace() since 
  * the HttpAdaptor devours them (what to do w/ template methods then?)
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class AdminDistributedSystemJmxImpl 
               extends AdminDistributedSystemImpl
@@ -297,7 +297,7 @@ public class AdminDistributedSystemJmxImpl
    * @throws com.gemstone.gemfire.admin.AdminException
    *           if construction of SystemMember instance fails
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected SystemMember createSystemMember(InternalDistributedMember member)
       throws com.gemstone.gemfire.admin.AdminException {
@@ -1094,7 +1094,7 @@ public class AdminDistributedSystemJmxImpl
   
   /**
    * @return the isRmiClientCountZero
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isRmiClientCountZero() {
     return isRmiClientCountZero;
@@ -1102,7 +1102,7 @@ public class AdminDistributedSystemJmxImpl
 
   /**
    * @param isRmiClientCountZero the isJmxClientCountZero to set
-   * @since 6.0
+   * @since GemFire 6.0
    */
   void setRmiClientCountZero(boolean isRmiClientCountZero) {
     this.isRmiClientCountZero = isRmiClientCountZero;
@@ -1453,7 +1453,7 @@ public class AdminDistributedSystemJmxImpl
    * 
    * @param alertDefinitionId id of a stat alert definition 
    * @return StatAlertDefinition reference to an instance of StatAlertDefinition
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private StatAlertDefinition getAlertDefinition(int alertDefinitionId) {
     synchronized(ALERT_DEFINITIONS) {
@@ -1470,7 +1470,7 @@ public class AdminDistributedSystemJmxImpl
    * 
    * @param alertDefinition StatAlertDefinition to retrieve
    * @return StatAlertDefinition 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public StatAlertDefinition getAlertDefinition(StatAlertDefinition alertDefinition) {
     return getAlertDefinition(alertDefinition.getId());
@@ -1645,7 +1645,7 @@ public class AdminDistributedSystemJmxImpl
    * A new alert definition will be created if matching one not found.
    * 
    * @param alertDefinition alertDefinition to be updated 
-   * @since 5.7
+   * @since GemFire 5.7
    */  
   public void updateAlertDefinition(StatAlertDefinition alertDefinition) {
     if (logger.isDebugEnabled()) {
@@ -1678,7 +1678,7 @@ public class AdminDistributedSystemJmxImpl
    * should notify members for the newly added alert definitions. 
    * 
    * @param defId id of the alert definition to be removed
-   * @since 5.7
+   * @since GemFire 5.7
    */  
   public void removeAlertDefinition(Integer defId) {
     if (logger.isDebugEnabled()) {
@@ -1710,7 +1710,7 @@ public class AdminDistributedSystemJmxImpl
    * @param alertDefinition alert definition to check whether already created
    * @return true if the alert definition is already created, false 
    *         otherwise 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean isAlertDefinitionCreated(StatAlertDefinition alertDefinition) {
     /*
@@ -1729,7 +1729,7 @@ public class AdminDistributedSystemJmxImpl
    * Returns the refresh interval for the Stats in seconds.
    * 
    * @return refresh interval for the Stats(in seconds)
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public synchronized int getRefreshIntervalForStatAlerts() {
     /*
@@ -1743,7 +1743,7 @@ public class AdminDistributedSystemJmxImpl
    * seconds 
    * 
    * @param refreshIntervalForStatAlerts refresh interval for the Stats(in seconds)
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public synchronized void setRefreshIntervalForStatAlerts(int refreshIntervalForStatAlerts) {
     /*
@@ -1758,7 +1758,7 @@ public class AdminDistributedSystemJmxImpl
    * runs/sessions
    * 
    * @return value of canPersistStatAlertDefs.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean canPersistStatAlertDefs() {
     return canPersistStatAlertDefs;
@@ -1826,7 +1826,7 @@ public class AdminDistributedSystemJmxImpl
    * member VM.
    * 
    * @param memberVM Member VM to set AlertsManager for
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public synchronized void setAlertsManager(GemFireVM memberVM) {
     /*
@@ -1869,7 +1869,7 @@ public class AdminDistributedSystemJmxImpl
    * Returns empty array if there are no stat alert definitions defined.
    * 
    * @return An array of all available StatAlertDefinition objects 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public StatAlertDefinition[] getAllStatAlertDefinitions() {
     if (logger.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index e50e124..b5e850d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -46,7 +46,7 @@ import java.util.StringTokenizer;
  * <p>
  * Extends and implements DistributedSystemConfig.
  *
- * @since     3.5 (in which it was named AgentConfig)
+ * @since GemFire     3.5 (in which it was named AgentConfig)
  */
 public class AgentConfigImpl extends DistributedSystemConfigImpl
   implements AgentConfig {
@@ -488,7 +488,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
    * Checks to see if this config object is "read only".  If it is,
    * then an {@link IllegalStateException} is thrown.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Override
   protected void checkReadOnly() {
@@ -865,7 +865,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
    * See <a href="#rmi-server-port">description</a> above.
    *
    * @return the value set for rmi-server-port
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public int getRmiServerPort() {
     return this.rmiServerPort;
@@ -875,7 +875,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
    * Sets the port of the RMI Connector Server.
    *
    * @param port rmi-server-port to set.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setRmiServerPort(int port) {
     checkReadOnly();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java
index 0f12e3a..7d880ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentImpl.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders;
  * The GemFire JMX Agent provides the ability to administrate one GemFire
  * distributed system via JMX.
  *
- * @since     3.5
+ * @since GemFire     3.5
  */
 public class AgentImpl
 implements com.gemstone.gemfire.admin.jmx.Agent,
@@ -1496,7 +1496,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
    * Distributed System.
    *
    * @see AdminDistributedSystemJmxImpl#setRmiClientCountZero(boolean)
-   * @since 6.0
+   * @since GemFire 6.0
    */
   void updateRmiClientsCount() {
     int noOfClientsConnected = 0;
@@ -1549,7 +1549,7 @@ implements com.gemstone.gemfire.admin.jmx.Agent,
  * Adapter class for NotificationListener that listens to notifications of type
  * javax.management.remote.JMXConnectionNotification
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 class ConnectionNotificationAdapter implements NotificationListener {
   private static final Logger logger = LogService.getLogger();
@@ -1587,7 +1587,7 @@ class ConnectionNotificationAdapter implements NotificationListener {
  * Filters out the notifications of the type JMXConnectionNotification.OPENED,
  * JMXConnectionNotification.CLOSED and JMXConnectionNotification.FAILED.
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 class ConnectionNotificationFilterImpl implements NotificationFilter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
index 5d18259..dfa9ac3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentLauncher.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.internal.util.JavaCommandBuilder;
  * A command line utility inspired by the <code>CacheServerLauncher</code> that is responsible for administering
  * a stand-along GemFire JMX {@link Agent}.
  * <p/>
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class AgentLauncher {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/CacheServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/CacheServerJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/CacheServerJmxImpl.java
index 45e4ae2..e203f5b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/CacheServerJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/CacheServerJmxImpl.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * MBean representation of a {@link
  * com.gemstone.gemfire.admin.CacheVm}. 
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CacheServerJmxImpl extends CacheServerImpl
   implements ManagedResource, CacheVmConfig, CacheServerConfig, SystemMemberJmx {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigAttributeInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigAttributeInfo.java
index 3075f76..7dba8d9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigAttributeInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigAttributeInfo.java
@@ -29,7 +29,7 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo;
  * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's 
  * <i>targetObject</i> value.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 class ConfigAttributeInfo 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/ConfigurationParameterJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index 84590db..20796c7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * ConfigurationParameterImpl. Wrap all delegate calls w/ e.printStackTrace()
  * since the HttpAdaptor devours them
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  */
 public class ConfigurationParameterJmxImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
index 57b47c5..5babbcd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
@@ -32,7 +32,7 @@ import javax.management.modelmbean.*;
  * @see GemFireHealthJmxImpl#createDistributedSystemHealthConfig
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class DistributedSystemHealthConfigJmxImpl
   extends DistributedSystemHealthConfigImpl 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DynamicManagedBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DynamicManagedBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DynamicManagedBean.java
index e9872ad..67bb0ec 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DynamicManagedBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/DynamicManagedBean.java
@@ -29,7 +29,7 @@ import org.apache.commons.modeler.ManagedBean;
  * Extends ManagedBean to allow for dynamically creating new instances of
  * ManagedBean based on an existing instance of ManagedBean.
  * 
- * @since 5.0.1
+ * @since GemFire 5.0.1
  */
 public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
   private static final long serialVersionUID = 4051924500150228160L;
@@ -87,7 +87,7 @@ public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
    * Removes the operation with the given name from thie
    * <code>ManageBean</code>'s operation descriptor list.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void removeOperation(String name) {
     if (name == null || name.length() < 1) {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/generator/AuthzCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/AuthzCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/AuthzCredentialGenerator.java
index a561de0..1a99974 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/AuthzCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/AuthzCredentialGenerator.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.security.templates.XmlAuthorization;
  * operation in a region. Implementations will be for different kinds of
  * authorization scheme and authentication scheme combos.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class AuthzCredentialGenerator {
   
@@ -320,7 +320,7 @@ public abstract class AuthzCredentialGenerator {
    * <p>All dunit tests will automagically start testing the new implementation
    * after this.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static final class ClassCode {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java
index fd079a2..90584cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/CredentialGenerator.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.security.templates.PKCSAuthenticator;
  * Encapsulates obtaining valid and invalid credentials. Implementations will be
  * for different kinds of authentication schemes.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class CredentialGenerator {
 
@@ -194,7 +194,7 @@ public abstract class CredentialGenerator {
    * <p>All security dunit tests will automagically start testing the new
    * implementation after this.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static final class ClassCode {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/generator/UserPasswordWithExtraPropsAuthInit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/UserPasswordWithExtraPropsAuthInit.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/UserPasswordWithExtraPropsAuthInit.java
index 6d0c583..06a4997 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/UserPasswordWithExtraPropsAuthInit.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/UserPasswordWithExtraPropsAuthInit.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
  * properties provided in getCredential props argument will also be 
  * copied as new credentials.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class UserPasswordWithExtraPropsAuthInit extends UserPasswordAuthInit {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthenticator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthenticator.java
index f9293b8..f086b67 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthenticator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthenticator.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.security.Authenticator;
  * user name and password allowing authentication depending on the format of the
  * user name.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class DummyAuthenticator implements Authenticator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthorization.java
index 17bc5e1..df08676 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthorization.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/DummyAuthorization.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * allows authorization depending on the format of the {@code Principal}
  * string.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class DummyAuthorization implements AccessControl {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/FunctionSecurityPrmsHolder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/FunctionSecurityPrmsHolder.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/FunctionSecurityPrmsHolder.java
index 9ce82f3..275a4ad 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/FunctionSecurityPrmsHolder.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/FunctionSecurityPrmsHolder.java
@@ -22,7 +22,7 @@ import java.util.Set;
  * This is a sample class for objects which hold information of the authorized
  * function names and authorized value for the {@code optimizeForWrite}.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class FunctionSecurityPrmsHolder {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/LdapUserAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/LdapUserAuthenticator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/LdapUserAuthenticator.java
index b92a08a..a9e875e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/LdapUserAuthenticator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/LdapUserAuthenticator.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.security.Authenticator;
 /**
  * An implementation of {@link Authenticator} that uses LDAP.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class LdapUserAuthenticator implements Authenticator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSAuthInit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSAuthInit.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSAuthInit.java
index 9f1ccec..f58d305 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSAuthInit.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/PKCSAuthInit.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.security.AuthenticationFailedException;
  * set to the fully qualified name the static {@code create} function
  * viz. {@code com.gemstone.gemfire.security.templates.PKCSAuthInit.create}
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class PKCSAuthInit implements AuthInitialize {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UserPasswordAuthInit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UserPasswordAuthInit.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UserPasswordAuthInit.java
index 6c05090..76c6987 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UserPasswordAuthInit.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UserPasswordAuthInit.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.security.AuthenticationFailedException;
  * set to the fully qualified name the static {@code create} method
  * viz. {@code com.gemstone.gemfire.security.templates.UserPasswordAuthInit.create}
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class UserPasswordAuthInit implements AuthInitialize {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipal.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipal.java
index a5062f2..4eefe46 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipal.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/UsernamePrincipal.java
@@ -22,7 +22,7 @@ import java.security.Principal;
 /**
  * An implementation of {@link Principal} class for a simple user name.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class UsernamePrincipal implements Principal, Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java
index b76eec5..50fc351 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlAuthorization.java
@@ -98,7 +98,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * not be used for post-operation authorization since it does nothing useful for
  * post-operation case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class XmlAuthorization implements AccessControl {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlErrorHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlErrorHandler.java b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlErrorHandler.java
index e2b286b..c770eb7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlErrorHandler.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/templates/XmlErrorHandler.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * cases while a {@link LogWriter#warning(String)} level logging is done for
  * the {@code warning} case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class XmlErrorHandler implements ErrorHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
index dec3338..ce5d595 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/IgnoredException.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * 
  * Extracted from DistributedTestCase.
  * 
- * @since 5.7bugfix
+ * @since GemFire 5.7bugfix
  */
 @SuppressWarnings("serial")
 public class IgnoredException implements Serializable {
@@ -144,7 +144,7 @@ public class IgnoredException implements Serializable {
    * suspect string is used by the GrepLogs utility and so can contain
    * regular expression characters.
    * 
-   * @since 5.7bugfix
+   * @since GemFire 5.7bugfix
    * @param suspectString the exception string to expect
    * @param vm the VM on which to log the expected exception or null for all VMs
    * @return an IgnoredException instance for removal purposes
@@ -197,7 +197,7 @@ public class IgnoredException implements Serializable {
    * If you do not remove the ignored exception, it will be removed at the
    * end of your test case automatically.
    * 
-   * @since 5.7bugfix
+   * @since GemFire 5.7bugfix
    * @param suspectString the exception string to expect
    * @return an IgnoredException instance for removal
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/ThreadUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/ThreadUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/ThreadUtils.java
index 6ac6449..fd14aa7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/ThreadUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/ThreadUtils.java
@@ -49,7 +49,7 @@ public class ThreadUtils {
   /**
    * Print stack dumps for all vms.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static void dumpAllStacks() {
     for (int h=0; h < Host.getHostCount(); h++) {
@@ -67,7 +67,7 @@ public class ThreadUtils {
   /** 
    * Print a stack dump for this vm.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static void dumpStack() {
     OSProcess.printStacks(0, false);
@@ -76,7 +76,7 @@ public class ThreadUtils {
   /** 
    * Print stack dumps for all vms on the given host.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static void dumpStack(final Host host) {
     for (int v=0; v < host.getVMCount(); v++) {
@@ -87,7 +87,7 @@ public class ThreadUtils {
   /** 
    * Print a stack dump for the given vm.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static void dumpStack(final VM vm) {
     vm.invoke(com.gemstone.gemfire.test.dunit.DistributedTestCase.class, "dumpStack");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
index afbb29d..ce32320 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit3CacheTestCase.java
@@ -99,7 +99,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase impl
   /**
    * Creates a client cache from the factory if one does not already exist.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final ClientCache getClientCache(final ClientCacheFactory factory) {
     return delegate.getClientCache(factory);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 1f9b54e..1d517bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -252,7 +252,7 @@ public class JUnit4CacheTestCase extends JUnit4DistributedTestCase implements Ca
   /**
    * Creates a client cache from the factory if one does not already exist.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final ClientCache getClientCache(final ClientCacheFactory factory) {
     synchronized (JUnit4CacheTestCase.class) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
index 71dee9b..f5f6bf6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit3DistributedTestCase.java
@@ -70,7 +70,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
    * <p>Note: "final" was removed so that WANTestBase can override this method.
    * This was part of the xd offheap merge.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public final InternalDistributedSystem getSystem(final Properties props) {
     return delegate.getSystem(props);
@@ -86,7 +86,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
    *
    * @see #getSystem(Properties)
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public final InternalDistributedSystem getSystem() {
     return delegate.getSystem();
@@ -107,7 +107,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
   /**
    * Returns a loner distributed system that isn't connected to other vms.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final InternalDistributedSystem getLonerSystem() {
     return delegate.getLonerSystem();
@@ -125,7 +125,7 @@ public abstract class JUnit3DistributedTestCase extends TestCase implements Dist
    * {@link DistributedSystem}. Unless overridden, this method will return an
    * empty {@code Properties} object.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public Properties getDistributedSystemProperties() {
     return delegate.defaultGetDistributedSystemProperties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index 8678095..e5c3df7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -153,7 +153,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur
    * <p>Note: "final" was removed so that WANTestBase can override this method.
    * This was part of the xd offheap merge.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public final InternalDistributedSystem getSystem(final Properties props) {
     // Setting the default disk store name is now done in setUp
@@ -224,7 +224,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur
    *
    * @see #getSystem(Properties)
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public final InternalDistributedSystem getSystem() {
     return getSystem(getDistributedSystemProperties());
@@ -245,7 +245,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur
   /**
    * Returns a loner distributed system that isn't connected to other vms.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final InternalDistributedSystem getLonerSystem() {
     Properties props = getDistributedSystemProperties();
@@ -268,7 +268,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur
    *
    * <p>Override this as needed. Default implementation returns empty {@code Properties}.
    *
-   * @since 3.0
+   * @since GemFire 3.0
    */
   @Override
   public Properties getDistributedSystemProperties() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenComparator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenComparator.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenComparator.java
index 357d5b2..9574577 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenComparator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenComparator.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.process.OutputFormatter;
 /**
  * Compares test output to golden text file.
  * 
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 public abstract class GoldenComparator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
index 1a4099e..1ea5fe6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.process.ProcessWrapper;
 /**
  * Test framework for launching processes and comparing output to expected golden output.
  *
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 public abstract class GoldenTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
index ac84976..4759ed4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Wraps spawned {@link java.lang.Process} to capture output and provide interaction with the process.
  *
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 public class ProcessWrapper {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/parReg/query/unittest/Position.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/parReg/query/unittest/Position.java b/geode-core/src/test/java/parReg/query/unittest/Position.java
index 8cbb370..adf2f96 100755
--- a/geode-core/src/test/java/parReg/query/unittest/Position.java
+++ b/geode-core/src/test/java/parReg/query/unittest/Position.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.Declarable;
  * this class is <code>Declarable</code>, we can describe instances of
  * it in a GemFire <code>cache.xml</code> file.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class Position implements Declarable, Serializable, Comparable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
index 51597e7..604018f 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 
 /**
  * Close a continuous query on the server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class CloseCQOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
index bca42d1..fda6eab 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
 
 /**
  * Creates a CQ on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class CreateCQOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
index b227a0d..437761d 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 
 /**
  * Creates a CQ and fetches initial results on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class CreateCQWithIROp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
index bf7e92b..bb5928c 100755
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
 
 /**
  * Retrieves all durable cqs for a client from a server
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GetDurableCQsOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
index f10eeb7..65a6b24 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.query.internal.cq.ClientCQ;
 
 /**
  * Used to send CQ operations from a client to a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerCQProxyImpl extends ServerProxy {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
index 47b7d47..f9e83b8 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 
 /**
  * Does a region query on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class StopCQOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
index cf1f545..9aa43d6 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * created. 
  * The setter methods all return the previous value of the attribute. 
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqAttributesMutatorImpl implements CqAttributesMutator {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
index d710e61..3596655 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query.internal.cq;
  * Interface for CqEvent. Offers methods to get information from
  * CqEvent.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 import com.gemstone.gemfire.InvalidDeltaException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
index 3d132c4..b467eb2 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * CqListener class, implements CqListener interface methods. 
  * Offers callback methods for the CqQuery.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqListenerImpl implements CqListener {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
index 32ea02f..275ec84 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.i18n.StringId;
 
 /**
- * @since 5.5
+ * @since GemFire 5.5
  * Represents the CqQuery object. Implements CqQuery API and CqAttributeMutator. 
  *  
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
index 9188e56..d1905a0 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
@@ -79,7 +79,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.i18n.StringId;
 
 /**
- * @since 5.5
+ * @since GemFire 5.5
  *
  * Implements the CqService functionality.
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
index 86a37e2..78329ce 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 /**
  * Provides statistical information about CqService.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqServiceStatisticsImpl implements CqServiceStatistics {
   private CqServiceImpl cqService;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
index dad55ff..3327909 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  *      Number of CQs closed
  *      Number of CQs on a client 
  * 
- * @since 5.5 
+ * @since GemFire 5.5
  */
 public class CqServiceVsdStats
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
index 4448c2f..d5930bc 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.query.CqStatistics;
 /**
  * Provides statistical information about a CqQuery.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqStatisticsImpl implements CqStatistics {
   private CqQueryImpl cqQuery;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java b/geode-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
index b3556f1..97d8341 100755
--- a/geode-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 
 public class ExecuteCQ61 extends BaseCQCommand {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 2b2dbd7..a06c51b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -3918,7 +3918,7 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
    * Starts a bridge server on the given port to serve up the given
    * region.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void startBridgeServer(int port) throws IOException {
     startBridgeServer(port, CacheServer.DEFAULT_NOTIFY_BY_SUBSCRIPTION);
@@ -3929,7 +3929,7 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void startBridgeServer(int port, boolean notifyBySubscription)
   throws IOException {
@@ -3945,7 +3945,7 @@ public void testCQEventsWithNotEqualsUndefined() throws Exception {
   /**
    * Stops the bridge server that serves up the given cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected void stopBridgeServer(Cache cache) {
     CacheServer bridge =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 548dd2f..a684e04 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -3245,7 +3245,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * Starts a bridge server on the given port to serve up the given
    * region.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void startBridgeServer(int port) throws IOException {
     startBridgeServer(port, CacheServer.DEFAULT_NOTIFY_BY_SUBSCRIPTION);
@@ -3256,7 +3256,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void startBridgeServer(int port, boolean notifyBySubscription)
   throws IOException {
@@ -3272,7 +3272,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
   /**
    * Stops the bridge server that serves up the given cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected void stopBridgeServer(Cache cache) {
     CacheServer bridge =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 29eec8e..0cc10c0 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 /**
  * Test class for Partitioned Region and CQs
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
 
@@ -1592,7 +1592,7 @@ public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected void startBridgeServer(int port, boolean notifyBySubscription)
   throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index ee8ea9f..ffdd734 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 /**
  * Test class for Partitioned Region and CQs
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class PrCqUsingPoolDUnitTest extends CacheTestCase {
 
@@ -1850,7 +1850,7 @@ public class PrCqUsingPoolDUnitTest extends CacheTestCase {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected void startBridgeServer(int port, boolean notifyBySubscription)
   throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index e4904ca..476caf1 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -576,7 +576,7 @@ public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public void startBridgeServer(int port, boolean notifyBySubscription)
   throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 7932e5c..8796d08 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
 /**
  * Tests for QueryMonitoring service.
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class QueryMonitorDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 68960bd..eb3f1f0 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -90,7 +90,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Tests putAll for c/s. Also tests removeAll
  * 
- * @since 5.0.23
+ * @since GemFire 5.0.23
  */
 @SuppressWarnings("serial")
 public class PutAllCSDUnitTest extends ClientServerTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 6d830b8..2e7339a 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -69,7 +69,7 @@ import junit.framework.TestSuite;
 /**
  *
  *
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class CQListGIIDUnitTest extends DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index a5c4ff6..4780623 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Test client to server flow for delta propogation
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class ClientToServerDeltaDUnitTest extends DistributedTestCase {
   /*

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index 4faade9..caf7136 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
  * functionality when clients crash.
  * 
  * 
- * @since 5.2
+ * @since GemFire 5.2
  */
 public class DurableClientCrashDUnitTest extends DurableClientTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
index a087386..fd43e0b 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
  * functionality when clients are disconnected from servers.
  * 
  * 
- * @since 5.2
+ * @since GemFire 5.2
  */
 public class DurableClientNetDownDUnitTest extends DurableClientCrashDUnitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index cfe4d67..ca2415d 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -75,7 +75,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * functionality.
  * 
  * 
- * @since 5.2
+ * @since GemFire 5.2
  */ 
 public class DurableClientTestCase extends DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index a277162..6645129 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -78,7 +78,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Dunit class for testing gemfire Client commands : list client , describe client
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(DistributedTest.class)
 public class ClientCommandsDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index f268c8f..7731c91 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  * This is the second part of the test which had become long enough to
  * occasionally go beyond the 10min limit.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ClientAuthorizationTwoDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index c47fd5b..9d7ffb9 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  * This enables testing of object and callback modification both in
  * pre-processing and post-processing phases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 03528fd..5bec7c6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.test.junit.rules.RetryRule;
  * with post-process callbacks in case return values of operations and for
  * notifications along-with failover.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ClientPostAuthorizationDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 1f011a6..ecade52 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * Implementation of LuceneService to create lucene index and query.
  * 
  * 
- * @since 8.5
+ * @since GemFire 8.5
  */
 public class LuceneServiceImpl implements InternalLuceneService {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/PulseAppListener.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/PulseAppListener.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/PulseAppListener.java
index 2e4e41d..1ca921e 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/PulseAppListener.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/PulseAppListener.java
@@ -51,7 +51,7 @@ import java.util.logging.Level;
  * This class is used for checking the application running mode i.e. Embedded or
  * not
  * 
- * @since version 7.0.Beta 2012-09-23
+ * @since GemFire version 7.0.Beta 2012-09-23
  * 
  */
 // @WebListener

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/controllers/PulseController.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/controllers/PulseController.java
index bbbadf4..3b8a87d 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/controllers/PulseController.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/controllers/PulseController.java
@@ -52,7 +52,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
  * This class contains the implementations for all http Ajax requests needs to
  * be served in Pulse.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Controller
 public class PulseController {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
index 3fb3218..786861f 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Cluster.java
@@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * Class Cluster This class is the Data Model for the data used for the Pulse
  * Web UI.
  *
- * @since version 7.0.Beta 2012-09-23
+ * @since GemFire version 7.0.Beta 2012-09-23
  */
 public class Cluster extends Thread {
   private static final int POLL_INTERVAL = 5000;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
index c491caf..768fe41 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/DataBrowser.java
@@ -41,7 +41,7 @@ import java.util.Scanner;
  * Class DataBrowser This class contains Data browser functionalities for
  * managing queries and histories.
  * 
- * @since version 7.5.Beta 2013-03-25
+ * @since GemFire version 7.5.Beta 2013-03-25
  */
 public class DataBrowser {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/IClusterUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/IClusterUpdater.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/IClusterUpdater.java
index 5128a57..49e2e1d 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/IClusterUpdater.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/IClusterUpdater.java
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
  * Interface having updateData() function which is getting Override by both
  * MockDataUpdater and JMXDataUpdater
  * 
- * @since  version 7.0.Beta 2012-09-23 
+ * @since GemFire  version 7.0.Beta 2012-09-23
  * 
  */
 public interface IClusterUpdater {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
index 4a95c91..10c821f 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JMXDataUpdater.java
@@ -70,7 +70,7 @@ import java.util.Set;
  * the required MBeans
  *
  *
- * @since version 7.0.Beta 2012-09-23
+ * @since GemFire version 7.0.Beta 2012-09-23
  */
 public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
index 9b5e4c4..b593062 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/JmxManagerFinder.java
@@ -40,7 +40,7 @@ import com.vmware.gemfire.tools.pulse.internal.util.ConnectionUtil;
  * GemFire's internal serialization codes and byte sequences have been hard
  * coded into this code.
  * 
- * @since version 7.0.Beta 2012-09-23
+ * @since GemFire version 7.0.Beta 2012-09-23
  * 
  */
 public class JmxManagerFinder {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConfig.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConfig.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConfig.java
index 6948979..c54554a 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConfig.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseConfig.java
@@ -26,7 +26,7 @@ import java.util.logging.Level;
  * 
  * PulseConfig is used for configuring Pulse application.
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  * 
  */
 public class PulseConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseVersion.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseVersion.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseVersion.java
index 7ac5f74..7057a41 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseVersion.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/PulseVersion.java
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
  * This class is for holding Pulse Applications Version's details (like version
  * details, build details, source details, etc) from properties file
  * 
- * @since version Helios
+ * @since GemFire version Helios
  */
 
 public class PulseVersion {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Repository.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Repository.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Repository.java
index 795e213..004d76b 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Repository.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/data/Repository.java
@@ -33,7 +33,7 @@ import java.util.ResourceBundle;
 /**
  * A Singleton instance of the memory cache for clusters.
  * 
- * @since version 7.0.Beta 2012-09-23
+ * @since GemFire version 7.0.Beta 2012-09-23
  */
 public class Repository {
   private PulseLogWriter LOGGER;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/LogWriter.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/LogWriter.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/LogWriter.java
index 6bcc743..c0bb013 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/LogWriter.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/LogWriter.java
@@ -24,7 +24,7 @@ package com.vmware.gemfire.tools.pulse.internal.log;
  * 
  * LogWriter interface for Pulse Logging.
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  * 
  */
 public interface LogWriter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/MessageFormatter.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/MessageFormatter.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/MessageFormatter.java
index 07787f2..cc57670 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/MessageFormatter.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/MessageFormatter.java
@@ -38,7 +38,7 @@ import com.vmware.gemfire.tools.pulse.internal.data.Repository;
  * MessageFormatter is the custom formatter class for formatting the log
  * messages.
  * 
- * @since version 7.0.1
+ * @since GemFire version 7.0.1
  */
 public class MessageFormatter extends Formatter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogWriter.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogWriter.java
index 2fc2223..a2fb327 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogWriter.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogWriter.java
@@ -34,7 +34,7 @@ import com.vmware.gemfire.tools.pulse.internal.data.Repository;
  * 
  * PulseLogWriter is the implementation of LogWriter.
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  * 
  */
 public class PulseLogWriter implements LogWriter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogger.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogger.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogger.java
index 6d9361b..ab25c9f 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogger.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/log/PulseLogger.java
@@ -38,7 +38,7 @@ import com.vmware.gemfire.tools.pulse.internal.data.PulseConstants;
  * PulseLogger is the custom logger class for Pulse Web Application. It logs
  * messages to the file in custom format.
  * 
- * @since version 7.0.Beta
+ * @since GemFire version 7.0.Beta
  */
 public class PulseLogger {
 
@@ -105,7 +105,7 @@ public class PulseLogger {
    * MessageFormatter is the custom formatter class for formatting the log
    * messages.
    * 
-   * @since version 7.0.Beta 2012-09-23
+   * @since GemFire version 7.0.Beta 2012-09-23
    */
   private static class MessageFormatter extends Formatter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthentication.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthentication.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthentication.java
index a7a611d..391ad39 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthentication.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthentication.java
@@ -45,7 +45,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
  * 2.a Using newly created authenticated connection AccessControlMXBean is called to get authentication
  * levels. See @See {@link #populateAuthorities(JMXConnector)}. This sets Spring Security Authorities
  * 2.b DataBrowser end-points are required to be authorized against Spring Granted Authority
- * @since version 9.0
+ * @since GemFire version 9.0
  */
 public class GemFireAuthentication extends UsernamePasswordAuthenticationToken {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthenticationProvider.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthenticationProvider.java
index ee263b1..2d7d606 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthenticationProvider.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/security/GemFireAuthenticationProvider.java
@@ -33,7 +33,7 @@ import org.springframework.security.core.GrantedAuthority;
 /**
  * Spring security AuthenticationProvider for GemFire. It connects to gemfire manager using given credentials.
  * Successful connect is treated as successful authentication and web user is authenticated
- * @since version 9.0
+ * @since GemFire version 9.0
  */
 public class GemFireAuthenticationProvider implements AuthenticationProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDetailsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDetailsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDetailsService.java
index 64d16f1..9ae228d 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDetailsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDetailsService.java
@@ -37,7 +37,7 @@ import java.text.DecimalFormat;
  * This service class has implementation for providing cluster's basic
  * statistical data.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java
index 2332426..62de9a4 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterDiskThroughputService.java
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
  * Class ClusterDiskThroughput This class contains implementations for getting
  * cluster's current disk throughput details and its trend over time
  * 
- * @since version 7.0.Beta
+ * @since GemFire version 7.0.Beta
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java
index d25759b..c76fce0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterGCPausesService.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Cluster's GC Pauses (JVM
  * Pauses) Details and its trend over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterKeyStatisticsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterKeyStatisticsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterKeyStatisticsService.java
index 9da1cbd..c8a6837 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterKeyStatisticsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterKeyStatisticsService.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Cluster's current Reads,
  * Writes and queries details and their trends over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java
index 3b55ed7..b5443de 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemberService.java
@@ -43,7 +43,7 @@ import java.util.List;
  * 
  * This class contains implementations of getting Cluster Member's details
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 // @Service("ClusterMember")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java
index cf4d950..de8efd8 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMembersRGraphService.java
@@ -43,7 +43,7 @@ import com.vmware.gemfire.tools.pulse.internal.data.Repository;
  * This class contains implementations of getting List of Cluster members and
  * their details
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("ClusterMembersRGraph")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemoryUsageService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemoryUsageService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemoryUsageService.java
index 32ce1eb..384507e 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemoryUsageService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterMemoryUsageService.java
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Cluster's overall current
  * memory usage details and its trend over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java
index 350846c..c15e613 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionService.java
@@ -44,7 +44,7 @@ import java.util.Map;
  *
  * This class contains implementations of getting Cluster's regions details
  *
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
index 3da4e59..2f50089 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterRegionsService.java
@@ -44,7 +44,7 @@ import java.util.Map;
  * 
  * This class contains implementations of getting Cluster's regions details
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java
index 39a67cf..3051581 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionService.java
@@ -46,7 +46,7 @@ import java.util.List;
  *
  * This class contains implementations of getting Cluster's selected region details
  *
- * @since version 7.5 cedar  2014-03-01
+ * @since GemFire version 7.5 cedar  2014-03-01
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
index f4e30e9..01bedf2 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterSelectedRegionsMemberService.java
@@ -42,7 +42,7 @@ import java.util.List;
  * This class contains implementations of getting Cluster's selected region's member specific details
  * for all members in that region
  *
- * @since version 7.5 cedar 2014-03-01
+ * @since GemFire version 7.5 cedar 2014-03-01
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterWANInfoService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterWANInfoService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterWANInfoService.java
index 94c9043..3a3dbe3 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterWANInfoService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/ClusterWANInfoService.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * This class contains implementations of getting Cluster's WAN Informations
  * (connected clusters)
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("ClusterWANInfo")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberAsynchEventQueuesService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
index 2359848..849dfe0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberAsynchEventQueuesService.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Asynchronous Event Queues
  * details of Cluster Member.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberAsynchEventQueues")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberClientsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberClientsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberClientsService.java
index 0aabb5e..695f038 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberClientsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberClientsService.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
  * 
  * This class contains implementations of getting Memeber's Clients.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberClients")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDetailsService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDetailsService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDetailsService.java
index a25ca18..a37edc1 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDetailsService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDetailsService.java
@@ -39,7 +39,7 @@ import java.text.DecimalFormat;
  * 
  * This class contains implementations of getting Memeber's Statistics.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberDetails")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDiskThroughputService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDiskThroughputService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDiskThroughputService.java
index b6371fb..fdc2ae0 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDiskThroughputService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberDiskThroughputService.java
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations for getting Memeber's current Disk
  * Throughput trends over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberDiskThroughput")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGCPausesService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGCPausesService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGCPausesService.java
index 2457b67..7488ab2 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGCPausesService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGCPausesService.java
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class contains implementations of getting Memeber's GC Pauses (JVM
  * Pauses) details and its trend over the time.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 
 @Component

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGatewayHubService.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGatewayHubService.java b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGatewayHubService.java
index 068867d..dd84b75 100644
--- a/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGatewayHubService.java
+++ b/geode-pulse/src/main/java/com/vmware/gemfire/tools/pulse/internal/service/MemberGatewayHubService.java
@@ -41,7 +41,7 @@ import java.util.Map;
  * This class contains implementations of getting Gateway Receivers and Senders
  * details of Cluster Member.
  * 
- * @since version 7.5
+ * @since GemFire version 7.5
  */
 @Component
 @Service("MemberGatewayHub")



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfig.java
index 11a767a..e46be1a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshConfig.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.util.IOUtils;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 // According to 8.0 discussions, gfsh should have as less confing as possible
 // hence Persisting GfshConfig is not done

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategy.java
index 74d1ca1..9611e22 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/GfshExecutionStrategy.java
@@ -49,7 +49,7 @@ import org.springframework.util.ReflectionUtils;
  * GemFire SHell (gfsh).
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshExecutionStrategy implements ExecutionStrategy {
   private Class<?>   mutex = GfshExecutionStrategy.class;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXConnectionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXConnectionException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXConnectionException.java
index cd06e52..633cd05 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXConnectionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXConnectionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.shell;
 /**
  * RuntimeException to wrap JMX Connection Error/Exception.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JMXConnectionException extends RuntimeException {
   private static final long serialVersionUID = 3872374016604940917L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXInvocationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXInvocationException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXInvocationException.java
index 5cb565a..4e76db6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXInvocationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JMXInvocationException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management.internal.cli.shell;
  * RuntimeException to wrap all the exception that could occur for JMX
  * operations/attributes.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JMXInvocationException extends RuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index 3804111..bbb0841 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
  * OperationInvoker JMX Implementation
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JmxOperationInvoker implements OperationInvoker {
 
@@ -444,7 +444,7 @@ public class JmxOperationInvoker implements OperationInvoker {
  * A Connection Notification Listener. Notifies Gfsh when a connection gets
  * terminated abruptly.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 class JMXConnectionListener implements NotificationListener {
   public static final String CHECK_PERIOD_PROP = "jmx.remote.x.client.connection.check.period";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/OperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/OperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/OperationInvoker.java
index 17513f7..f5673c0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/OperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/OperationInvoker.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.CommandRequest;
  * There could be many different implementations of OperationInvoker based on different protocols like JMX, HTTP
  * and so on.
  * <p/>
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface OperationInvoker {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/ANSIHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/ANSIHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/ANSIHandler.java
index cbe4448..d50ec9d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/ANSIHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/ANSIHandler.java
@@ -21,7 +21,7 @@ import org.springframework.shell.core.JLineLogHandler;
 /**
  * Overrides jline.History to add History without newline characters.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ANSIHandler {
   private static ANSIHandler instance;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshHistory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshHistory.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshHistory.java
index 2175692..4842cb4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshHistory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshHistory.java
@@ -26,7 +26,7 @@ import jline.console.history.MemoryHistory;
 /**
  * Overrides jline.History to add History without newline characters.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshHistory extends MemoryHistory {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
index 08e4b24..96ffffa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/jline/GfshUnsupportedTerminal.java
@@ -22,7 +22,7 @@ import jline.UnsupportedTerminal;
  * Used when gfsh is run in Head Less mode. 
  * Doesn't support ANSI.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshUnsupportedTerminal extends UnsupportedTerminal {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CauseFinder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CauseFinder.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CauseFinder.java
index 74d8caf..5a6a87d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CauseFinder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CauseFinder.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.management.internal.cli.util;
  * <li> find a cause by specific type 
  * </ul>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CauseFinder {
   private static final int START_INDEX = 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ClasspathScanLoadHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ClasspathScanLoadHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ClasspathScanLoadHelper.java
index 39170e4..ba16a6e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ClasspathScanLoadHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ClasspathScanLoadHelper.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
  * Utility class to scan class-path & load classes.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ClasspathScanLoadHelper {
   private static final String CLASSFILE_EXTENSION = ".class";
@@ -242,7 +242,7 @@ public class ClasspathScanLoadHelper {
   /**
    * FileFilter to filter out GemFire Test Code.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class TestClassFilter implements FileFilter {
     private static final String TESTS_CODE_INDICATOR = "Test";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommandStringBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommandStringBuilder.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommandStringBuilder.java
index 4be381f..f178204 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommandStringBuilder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommandStringBuilder.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
  * commands
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandStringBuilder {
   private final String OPTION_MARKER    = SyntaxConstants.LONG_OPTION_SPECIFIER;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommentSkipHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommentSkipHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommentSkipHelper.java
index 2d46c18..b300dbe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommentSkipHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/CommentSkipHelper.java
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
  * Utility based on code extracted from
  * {@link org.springframework.shell.core.AbstractShell#executeCommand(String)}
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 // @original-author Ben Alex
 public class CommentSkipHelper {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreCompacter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreCompacter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreCompacter.java
index 513ca3d..caabab7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreCompacter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreCompacter.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DiskStoreCompacter {
   public static String STACKTRACE_START = "--------------------------";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreNotFoundException.java
index f9e6854..284beec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreNotFoundException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
  * on a member specified by name!
  * </p>
  * @see com.gemstone.gemfire.GemFireException
- * @since 7.0
+ * @since GemFire 7.0
  */
 // TODO this GemFireException should be moved to a more appropriate package!
   @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreValidater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreValidater.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreValidater.java
index c19fd60..43b62fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreValidater.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/DiskStoreValidater.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/GfshConsoleReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/GfshConsoleReader.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/GfshConsoleReader.java
index 5cd1dda..6d5f9f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/GfshConsoleReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/GfshConsoleReader.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
  * 
  * TODO - Abhishek: Investigate if stty settings can avoid this?
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  */
 public class GfshConsoleReader extends GfeConsoleReader {
   private Gfsh gfsh;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JConsoleNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JConsoleNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JConsoleNotFoundException.java
index 2657cb0..80dfcd6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JConsoleNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JConsoleNotFoundException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
  * not be located in the file system.
  * </p>
  * @see com.gemstone.gemfire.GemFireException
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class JConsoleNotFoundException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JsonUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JsonUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JsonUtil.java
index 07b3c16..4075b37 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JsonUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/JsonUtil.java
@@ -45,7 +45,7 @@ import org.json.JSONObject;
  * used by classes used for the Command Line Interface (CLI).
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JsonUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MemberNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MemberNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MemberNotFoundException.java
index 6abeef5..d2fd63b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MemberNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MemberNotFoundException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
  * distributed system.
  * </p>
  * @see com.gemstone.gemfire.GemFireException
- * @since 7.0
+ * @since GemFire 7.0
  */
 // TODO this GemFireException should be moved to a more appropriate package!
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MergeLogs.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MergeLogs.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MergeLogs.java
index 625ff24..057d6a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MergeLogs.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/MergeLogs.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
  
 public class MergeLogs {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ReadWriteFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ReadWriteFile.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ReadWriteFile.java
index ff4d1de..456f6ba 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ReadWriteFile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/ReadWriteFile.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.management.internal.cli.GfshParser;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ReadWriteFile {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/RegionPath.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/RegionPath.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/RegionPath.java
index d40efc6..87a3e44 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/RegionPath.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/RegionPath.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.management.ManagementService;
 /**
  * Class to handle Region path. 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionPath {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/VisualVmNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/VisualVmNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/VisualVmNotFoundException.java
index ca716c8..687d3ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/VisualVmNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/util/VisualVmNotFoundException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
  * tool could not be found on the system.
  * </p>
  * @see com.gemstone.gemfire.GemFireException
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class VisualVmNotFoundException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
index a674d56..e7259cb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElement.java
@@ -103,7 +103,7 @@ public class CacheElement {
    * @throws ParserConfigurationException 
    * @throws SAXException 
    * @throws XPathExpressionException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static LinkedHashMap<String, CacheElement> buildElementMap(final Document doc) throws IOException, XPathExpressionException, SAXException, ParserConfigurationException {
     final Map<String, List<String>> schemaLocationMap = XmlUtils.buildSchemaLocationMap(
@@ -129,7 +129,7 @@ public class CacheElement {
    * @return {@link InputSource} for schema if found.
    * @throws IOException
    *           if unable to open {@link InputSource}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final InputSource resolveSchema(final Map<String, List<String>> schemaLocationMap, String namespaceUri) throws IOException {
     final EntityResolver2 entityResolver = new CacheXmlParser();
@@ -168,7 +168,7 @@ public class CacheElement {
    * @throws IOException
    * @throws ParserConfigurationException 
    * @throws XPathExpressionException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final void buildElementMapCacheType(final LinkedHashMap<String, CacheElement> elementMap, final InputSource inputSource) throws SAXException,
       IOException, ParserConfigurationException, XPathExpressionException {
@@ -200,7 +200,7 @@ public class CacheElement {
    *          XPath context for queries.
    * @return final rank of elements.
    * @throws XPathExpressionException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static int buildElementMapXPath(final LinkedHashMap<String, CacheElement> elementMap, final Document schema, final Node parent, int rank,
       final String xPath, final XPathContext xPathContext) throws XPathExpressionException {
@@ -238,7 +238,7 @@ public class CacheElement {
    * @param element
    *          to test for multiple.
    * @return true if mulitple allowed, otherwise false.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static boolean isMultiple(final Element element) {
     final String maxOccurs = getAttribute(element, "maxOccurs");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
index f8da915..0e620aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/domain/XmlEntity.java
@@ -152,7 +152,7 @@ public class XmlEntity implements DataSerializable {
    * {@link #XmlEntity(String, String, String)} and
    * {@link XmlEntityBuilder#build()}.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private final void init() {
     Assert.hasLength(type, "Type cannot be empty");
@@ -188,7 +188,7 @@ public class XmlEntity implements DataSerializable {
    * @param xmlDocument
    *          to extract XML from.
    * @return XML for {@link XmlEntity} if found, otherwise <code>null</code>.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private final String loadXmlDefinition(final String xmlDocument) {
     final Cache cache = CacheFactory.getAnyInstance();
@@ -209,7 +209,7 @@ public class XmlEntity implements DataSerializable {
    * @throws XPathExpressionException 
    * @throws TransformerException 
    * @throws TransformerFactoryConfigurationError 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private final String loadXmlDefinition(final Document document) throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
     final Cache cache = CacheFactory.getAnyInstance();
@@ -311,7 +311,7 @@ public class XmlEntity implements DataSerializable {
    * if not set.
    * 
    * @return XML element namespace
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getNamespace() {
     return namespace;
@@ -322,7 +322,7 @@ public class XmlEntity implements DataSerializable {
    * set.
    * 
    * @return XML element prefix
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getPrefix() {
     return prefix;
@@ -393,7 +393,7 @@ public class XmlEntity implements DataSerializable {
    * Produce a new {@link XmlEntityBuilder}.
    * 
    * @return new {@link XmlEntityBuilder}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final XmlEntityBuilder builder() {
     return new XmlEntityBuilder();
@@ -404,7 +404,7 @@ public class XmlEntity implements DataSerializable {
    * {@link XmlEntity}.
    * 
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final class XmlEntityBuilder {
     private XmlEntity xmlEntity;
@@ -412,7 +412,7 @@ public class XmlEntity implements DataSerializable {
     /**
      * Private contstructor.
      * 
-     * @since 8.1
+     * @since GemFire 8.1
      */
     private XmlEntityBuilder() {
       xmlEntity = new XmlEntity();
@@ -426,7 +426,7 @@ public class XmlEntity implements DataSerializable {
      * You are required to at least call {@link #withType(String)}.
      * 
      * @return {@link XmlEntity}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntity build() {
         xmlEntity.init();
@@ -444,7 +444,7 @@ public class XmlEntity implements DataSerializable {
      * @param type
      *          Name of element type.
      * @return this {@link XmlEntityBuilder}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withType(final String type) {
       xmlEntity.type = type;
@@ -463,7 +463,7 @@ public class XmlEntity implements DataSerializable {
      * @param namespace
      *          Namespace of element
      * @return this {@link XmlEntityBuilder}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withNamespace(final String prefix, final String namespace) {
       xmlEntity.prefix = prefix;
@@ -482,7 +482,7 @@ public class XmlEntity implements DataSerializable {
      * @param value
      *          Value of attribute to set.
      * @return this {@link XmlEntityBuilder}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withAttribute(final String name, final String value) {
       xmlEntity.attributes.put(name, value);
@@ -496,7 +496,7 @@ public class XmlEntity implements DataSerializable {
      * @param attributes
      *          {@link Map} to use.
      * @return this {@link XmlEntityBuilder}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withAttributes(final Map<String, String> attributes) {
       xmlEntity.attributes = attributes;
@@ -514,7 +514,7 @@ public class XmlEntity implements DataSerializable {
      * @param xmlDocument
      *          Config XML document.
      * @return this {@link XmlEntityBuilder}
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withConfig(final String xmlDocument) {
       xmlEntity.xmlDefinition = xmlEntity.loadXmlDefinition(xmlDocument);
@@ -535,7 +535,7 @@ public class XmlEntity implements DataSerializable {
      * @throws TransformerException 
      * @throws TransformerFactoryConfigurationError 
      * @throws XPathExpressionException 
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlEntityBuilder withConfig(final Document document) throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
       xmlEntity.xmlDefinition = xmlEntity.loadXmlDefinition(document);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlConstants.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlConstants.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlConstants.java
index 88327bc..bd2963e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlConstants.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlConstants.java
@@ -21,7 +21,7 @@ import javax.xml.XMLConstants;
 
 /**
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class XmlConstants {
 
@@ -29,7 +29,7 @@ public final class XmlConstants {
    * Standard prefix for {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI}
    * (http://www.w3.org/2001/XMLSchema-instance) namespace.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String W3C_XML_SCHEMA_INSTANCE_PREFIX = "xsi";
 
@@ -38,14 +38,14 @@ public final class XmlConstants {
    * {@link XMLConstants#W3C_XML_SCHEMA_INSTANCE_NS_URI}
    * (http://www.w3.org/2001/XMLSchema-instance) namespace.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION = "schemaLocation";
 
   /**
    * Default prefix. Effectively no prefix.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String DEFAULT_PREFIX = "";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
index 7860eab..f983861 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtils.java
@@ -77,7 +77,7 @@ public class XmlUtils {
    * @throws ParserConfigurationException 
    * @throws SAXException 
    * @throws IOException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Document createDocumentFromReader(final Reader reader) throws SAXException, ParserConfigurationException, IOException {
     Document doc = null;
@@ -193,7 +193,7 @@ public class XmlUtils {
    * @param type
    * @return <code>true</code> if element allows multiple, otherwise
    *         <code>false</code>.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static boolean isMultiple(final LinkedHashMap<String, CacheElement> elementOrderMap, final String namespace, final String type) {
     if (CacheXml.GEODE_NAMESPACE.equals(namespace)) {
@@ -215,7 +215,7 @@ public class XmlUtils {
    * @param type
    * @return position of the element if in map, otherwise
    *         {@link Integer#MAX_VALUE}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static int getElementOrder(final LinkedHashMap<String, CacheElement> elementOrderMap, final String namespace, final String type) {
     if (CacheXml.GEODE_NAMESPACE.equals(namespace)) {
@@ -277,7 +277,7 @@ public class XmlUtils {
    * @param schemaLocation
    *          attribute value to build schema location map from.
    * @return {@link Map} of schema namespace URIs to location URLs.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Map<String, List<String>> buildSchemaLocationMap(final String schemaLocation) {
     return buildSchemaLocationMap(new HashMap<String, List<String>>(), schemaLocation);
@@ -296,7 +296,7 @@ public class XmlUtils {
   * @param schemaLocation
   *          attribute value to build schema location map from.
   * @return {@link Map} of schema namespace URIs to location URLs.
-  * @since 8.1
+  * @since GemFire 8.1
   */
  static final Map<String, List<String>> buildSchemaLocationMap(Map<String, List<String>> schemaLocationMap, final String schemaLocation) {
    if (null == schemaLocation) {
@@ -464,7 +464,7 @@ public class XmlUtils {
    *          Schema location to upgrade to.
    * @throws XPathExpressionException 
    * @throws ParserConfigurationException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   // UnitTest SharedConfigurationTest.testCreateAndUpgradeDocumentFromXml()
   public static Document upgradeSchema(Document document, final String namespaceUri, final String schemaLocation, String schemaVersion) throws XPathExpressionException, ParserConfigurationException {
@@ -546,7 +546,7 @@ public class XmlUtils {
    * 
    * @param schemaLocationMap
    *          {@link Map} to get schema locations from.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final String getSchemaLocationValue(final Map<String, List<String>> schemaLocationMap) {
     final StringBuilder sb = new StringBuilder();
@@ -567,7 +567,7 @@ public class XmlUtils {
    * @param root
    *          {@link Element} to get namespaces and prefixes from.
    * @return {@link Map} of namespace URIs to prefixes.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final Map<String, String> buildNamespacePrefixMap(final Element root) {
     final HashMap<String, String> namespacePrefixMap = new HashMap<>();
@@ -610,7 +610,7 @@ public class XmlUtils {
    *          new Namespace URI to change to.
    * @throws XPathExpressionException
    * @return the modified version of the passed in node. 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static final Node changeNamespace(final Node node, final String oldNamespaceUri, final String newNamespaceUri) throws XPathExpressionException {
     Node result = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactRequest.java
index 7d4ddd8..efd02e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactRequest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * compact their disk stores.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 // NOTE: This is copied from com/gemstone/gemfire/internal/admin/remote/CompactRequest.java
 // and modified as per requirements. (original-author Dan Smith)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactResponse.java
index 84f6ee5..4bc3054 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/messages/CompactResponse.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.admin.remote.AdminResponse;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 //NOTE: This is copied from com/gemstone/gemfire/internal/admin/remote/CompactResponse.java
 //and modified as per requirements. (original-author Dan Smith)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMBean.java
index 1a7191b..1306fc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMBean.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
  * AccessControlMBean Implementation. This retrieves JMXPrincipal from AccessController
  * and performs authorization for given role using gemfire AccessControl Plugin
  *
- * @since 9.0
+ * @since Geode 1.0
  */
 public class AccessControlMBean implements AccessControlMXBean {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMXBean.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMXBean.java
index a3ccb1e..6a73450 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/AccessControlMXBean.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.management.internal.security;
 
 /**
  * Interface for AccessControlMBean
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface AccessControlMXBean {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
index 99cbe2e..efbc1f1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/security/MBeanServerWrapper.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
 /**
  * This class intercepts all MBean requests for GemFire MBeans and passed it to
  * ManagementInterceptor for authorization
- * @since 9.0
+ * @since Geode 1.0
  *
  */
 public class MBeanServerWrapper implements MBeanServerForwarder {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
index 1f6c52a..f78c6f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractCommandsController.java
@@ -74,7 +74,7 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
  * @see org.springframework.stereotype.Controller
  * @see org.springframework.web.bind.annotation.ExceptionHandler
  * @see org.springframework.web.bind.annotation.InitBinder
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class AbstractCommandsController {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractMultiPartCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractMultiPartCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractMultiPartCommandsController.java
index 32187a9..a82b924 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractMultiPartCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/AbstractMultiPartCommandsController.java
@@ -30,7 +30,7 @@ import org.springframework.web.multipart.MultipartFile;
  * handling multi-part (file upload) HTTP requests.
  * <p/>
  * @see com.gemstone.gemfire.management.internal.web.controllers.AbstractCommandsController
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class AbstractMultiPartCommandsController extends AbstractCommandsController {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClientCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClientCommandsController.java
index 327c3a4..080a307 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClientCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClientCommandsController.java
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.PathVariable
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("clientController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClusterCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClusterCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClusterCommandsController.java
index a896966..ac32709 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClusterCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ClusterCommandsController.java
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.ResponseBody
  * @see com.gemstone.gemfire.management.internal.web.controllers.AbstractCommandsController
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("clusterController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
index fa0f8e9..ebacd3d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ConfigCommandsController.java
@@ -44,7 +44,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("configController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DataCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DataCommandsController.java
index 91004b3..870f54f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DataCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DataCommandsController.java
@@ -42,7 +42,7 @@ import org.springframework.web.context.request.WebRequest;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("dataController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DeployCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DeployCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DeployCommandsController.java
index 30091b7..c71e587 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DeployCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DeployCommandsController.java
@@ -41,7 +41,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("deployController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DiskStoreCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DiskStoreCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DiskStoreCommandsController.java
index d99909e..c9bd0d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DiskStoreCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DiskStoreCommandsController.java
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("diskStoreController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
index fe00c63..28c7f49 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("durableClientController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/FunctionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/FunctionCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/FunctionCommandsController.java
index e8cee1d..8e828e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/FunctionCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/FunctionCommandsController.java
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("functionController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/IndexCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/IndexCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/IndexCommandsController.java
index aef1eb1..d9af9f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/IndexCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/IndexCommandsController.java
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("indexController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/LauncherLifecycleCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/LauncherLifecycleCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/LauncherLifecycleCommandsController.java
index 4e49f33..469d092 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/LauncherLifecycleCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/LauncherLifecycleCommandsController.java
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMapping
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("launcherLifecycleController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MemberCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MemberCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MemberCommandsController.java
index b9ab3e8..e08e10f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MemberCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MemberCommandsController.java
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("memberController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
index 2326109..a6c9708 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/MiscellaneousCommandsController.java
@@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("miscellaneousController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/PdxCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/PdxCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/PdxCommandsController.java
index 88557fb..3cc2c14 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/PdxCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/PdxCommandsController.java
@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("pdxController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java
index 519b5b0..9367612 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/QueueCommandsController.java
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("queueController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/RegionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/RegionCommandsController.java
index 67bbdec..365ad2a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/RegionCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/RegionCommandsController.java
@@ -39,7 +39,7 @@ import org.springframework.web.context.request.WebRequest;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("regionController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
index c41f747..9804090 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/ShellCommandsController.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.management.internal.web.http.HttpMethod;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("shellController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsController.java
index d32ae4f..b321ea9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/WanCommandsController.java
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @see org.springframework.web.bind.annotation.RequestMethod
  * @see org.springframework.web.bind.annotation.RequestParam
  * @see org.springframework.web.bind.annotation.ResponseBody
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Controller("wanController")
 @RequestMapping(AbstractCommandsController.REST_API_VERSION)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index e6cdbee..cefec91 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -39,7 +39,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
  * @see javax.servlet.http.HttpServletRequest
  * @see javax.servlet.http.HttpServletResponse
  * @see org.springframework.web.servlet.handler.HandlerInterceptorAdapter
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
index be7342d..da4dee7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/Link.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.management.internal.web.util.UriUtils;
  * @see com.gemstone.gemfire.management.internal.web.domain.LinkIndex
  * @see com.gemstone.gemfire.management.internal.web.util.UriUtils
  * @see com.gemstone.gemfire.management.internal.web.http.HttpMethod
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 @XmlType(name = "link", propOrder = { "method", "href", "relation" })

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndex.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndex.java
index a1b063a..07027b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndex.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/LinkIndex.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * <p/>
  * @see javax.xml.bind.annotation.XmlRootElement
  * @see com.gemstone.gemfire.management.internal.web.domain.Link
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 @XmlRootElement(name = "link-index")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSource.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSource.java
index 8ffda44..3bfdc90 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/domain/QueryParameterSource.java
@@ -26,7 +26,7 @@ import javax.management.QueryExp;
  * @see java.io.Serializable
  * @see javax.management.ObjectName
  * @see javax.management.QueryExp
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class QueryParameterSource implements Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
index f6e5731..447733d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/ClientHttpRequest.java
@@ -63,7 +63,7 @@ import org.springframework.web.util.UriTemplate;
  * @see org.springframework.util.MultiValueMap
  * @see org.springframework.web.util.UriComponentsBuilder
  * @see org.springframework.web.util.UriTemplate
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class ClientHttpRequest implements HttpRequest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
index 931eaa0..e8b9a05 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpHeader.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * The HttpHeader enum is an enumeration of all HTTP request/response header names.
  * <p/>
  * @see <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html</a>
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public enum HttpHeader {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpMethod.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpMethod.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpMethod.java
index 197cfd7..f7396e7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpMethod.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/HttpMethod.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.web.http;
 /**
  * The HttpMethod enum is an enumeration of all HTTP methods (POST, GET, PUT, DELETE, HEADERS, etc).
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public enum HttpMethod {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
index a5972bd..9951d27 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
@@ -41,7 +41,7 @@ import org.springframework.util.StreamUtils;
  * @see org.springframework.http.HttpOutputMessage
  * @see org.springframework.http.MediaType
  * @see org.springframework.http.converter.AbstractHttpMessageConverter
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class SerializableObjectHttpMessageConverter extends AbstractHttpMessageConverter<Serializable> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/support/SimpleHttpRequester.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/support/SimpleHttpRequester.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/support/SimpleHttpRequester.java
index 901412f..1a22720 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/support/SimpleHttpRequester.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/http/support/SimpleHttpRequester.java
@@ -42,7 +42,7 @@ import org.springframework.web.client.RestTemplate;
  * <p/>
  * @see org.springframework.http.client.SimpleClientHttpRequestFactory
  * @see org.springframework.web.client.RestTemplate
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class SimpleHttpRequester {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileAdapter.java
index 33b3549..ba61043 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileAdapter.java
@@ -27,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
  * overriding behavior applicable to the implementation.
  * <p/>
  * @see org.springframework.web.multipart.MultipartFile
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class MultipartFileAdapter implements MultipartFile {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileResourceAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileResourceAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileResourceAdapter.java
index 1d964ad..136c21f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileResourceAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/io/MultipartFileResourceAdapter.java
@@ -29,7 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @see org.springframework.core.io.AbstractResource
  * @see org.springframework.core.io.Resource
  * @see org.springframework.web.multipart.MultipartFile
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class MultipartFileResourceAdapter extends AbstractResource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/AbstractHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/AbstractHttpOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/AbstractHttpOperationInvoker.java
index c142cdf..361d1fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/AbstractHttpOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/AbstractHttpOperationInvoker.java
@@ -73,7 +73,7 @@ import org.springframework.web.client.RestTemplate;
  * @see com.gemstone.gemfire.management.internal.web.shell.SimpleHttpOperationInvoker
  * @see org.springframework.http.client.SimpleClientHttpRequestFactory
  * @see org.springframework.web.client.RestTemplate
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class AbstractHttpOperationInvoker implements HttpOperationInvoker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/HttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/HttpOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/HttpOperationInvoker.java
index 59355a8..83098ee 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/HttpOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/HttpOperationInvoker.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.OperationInvoker;
  * The HttpOperationInvoker interface is a marker interface for HTTP-based OperationInvokers.
  * <p/>
  * @see com.gemstone.gemfire.management.internal.cli.shell.OperationInvoker
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public interface HttpOperationInvoker extends OperationInvoker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/MBeanAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/MBeanAccessException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/MBeanAccessException.java
index d9687ab..92fe6e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/MBeanAccessException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/MBeanAccessException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.management.internal.web.shell;
  * invocation of an MBean operation failed.
  * <p/>
  * @see java.lang.RuntimeException
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class MBeanAccessException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestApiCallForCommandNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
index d06fb4a..c061ca1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management.internal.web.shell;
  * The NoRestApiCallForCommandException class...
  * <p/>
  * @see java.lang.RuntimeException
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class RestApiCallForCommandNotFoundException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvoker.java
index 0ead2d7..e302cc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/RestHttpOperationInvoker.java
@@ -58,7 +58,7 @@ import org.springframework.web.util.UriTemplate;
  * @see com.gemstone.gemfire.management.internal.web.shell.AbstractHttpOperationInvoker
  * @see com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker
  * @see com.gemstone.gemfire.management.internal.web.shell.SimpleHttpOperationInvoker
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class RestHttpOperationInvoker extends AbstractHttpOperationInvoker implements Initable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvoker.java
index 2b900fb..9351109 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/SimpleHttpOperationInvoker.java
@@ -41,7 +41,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * @see com.gemstone.gemfire.management.internal.web.shell.AbstractHttpOperationInvoker
  * @see com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker
  * @see com.gemstone.gemfire.management.internal.web.shell.RestHttpOperationInvoker
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class SimpleHttpOperationInvoker extends AbstractHttpOperationInvoker {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpInvocationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpInvocationHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpInvocationHandler.java
index 7cc1364..8a0ebcc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpInvocationHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpInvocationHandler.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker;
  * @see java.lang.reflect.InvocationHandler
  * @see javax.management.ObjectName
  * @see com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class HttpInvocationHandler implements InvocationHandler {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpMBeanProxyFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpMBeanProxyFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpMBeanProxyFactory.java
index cabd907..c5ef5f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpMBeanProxyFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/shell/support/HttpMBeanProxyFactory.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker;
  * <p/>
  * @see java.lang.reflect.Proxy
  * @see com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public class HttpMBeanProxyFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtils.java
index 86634d1..bdf114c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/ConvertUtils.java
@@ -34,7 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
  * and REST interface.
  * <p/>
  * @see com.gemstone.gemfire.management.internal.cli.CliUtil
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class ConvertUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/UriUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/UriUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/UriUtils.java
index 98fee1b..401e396 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/UriUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/util/UriUtils.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * <p/>
  * @see java.net.URLDecoder
  * @see java.net.URLEncoder
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class UriUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembership.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembership.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembership.java
index 1d64a9f..9496022 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembership.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembership.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
  * Provides utility methods for registering and unregistering
  * ClientMembershipListeners in this process.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class ClientMembership {
 



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

Posted by ja...@apache.org.
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();
   



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index 22bb176..6578f77 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -413,7 +413,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
    * Tests that configuring a distributed system with a cache-xml-file
    * of "" does not initialize a cache.  See bug 32254.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Test
   public void testEmptyCacheXmlFile() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
index fe8c204..d11dea3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 /**
  * Extracted from LocatorLauncherLocalIntegrationTest.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(DistributedTest.class)
 public class HostedLocatorsDUnitTest extends JUnit4DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
index 1a2e2d7..e10e81d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * Tests querying of MemberMXBean which is used by MBeanProcessController to
  * control GemFire ControllableProcesses.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 public class LauncherMemberMXBeanIntegrationTest extends AbstractLauncherIntegrationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 3a06c1c..8b70221 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -53,7 +53,7 @@ import java.util.Set;
  * Tests the ability of the {@link Locator} API to start and stop
  * locators running in remote VMs.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class LocatorDUnitTest extends DistributedTestCase {
 
@@ -1817,7 +1817,7 @@ public class LocatorDUnitTest extends DistributedTestCase {
    * Tests starting, stopping, and restarting a locator.  See bug
    * 32856.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void testRestartLocator() throws Exception {
     disconnectAllFromDS();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java
index 6451a67..b960356 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalFileIntegrationTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse;
  * the Attach API which is in the JDK tools.jar. As a result LocatorLauncher
  * ends up using the FileProcessController implementation.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index a8998f1..9fd1cd8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -50,7 +50,7 @@ import org.junit.runners.Parameterized;
 /**
  * Tests usage of LocatorLauncher as a local API in existing JVM.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java
index 4d8b94b..f1e3ee6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteFileIntegrationTest.java
@@ -44,7 +44,7 @@ import org.junit.runners.Parameterized;
  * the Attach API which is in the JDK tools.jar.  As a result LocatorLauncher
  * ends up using the FileProcessController implementation.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
index 5cd1fcf..10cafe3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -57,7 +57,7 @@ import org.junit.runners.Parameterized;
 /**
  * Integration tests for launching a Locator in a forked process.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 @RunWith(Parameterized.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
index 3799a64..c54a238 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.distributed.LocatorLauncher.Command
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class LocatorLauncherTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalFileIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalFileIntegrationTest.java
index 5a457a7..40dbb71 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalFileIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalFileIntegrationTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * the Attach API which is in the JDK tools.jar.  As a result ServerLauncher
  * ends up using the FileProcessController implementation.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 public class ServerLauncherLocalFileIntegrationTest extends ServerLauncherLocalIntegrationTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index 85bfe0a..52deb38 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * @see com.gemstone.gemfire.distributed.ServerLauncher.Builder
  * @see com.gemstone.gemfire.distributed.ServerLauncher.ServerState
  * @see com.gemstone.gemfire.internal.AvailablePortHelper
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIntegrationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteFileIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteFileIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteFileIntegrationTest.java
index 3b5884c..5bac3a0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteFileIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteFileIntegrationTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * the Attach API which is in the JDK tools.jar.  As a result ServerLauncher
  * ends up using the FileProcessController implementation.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 public class ServerLauncherRemoteFileIntegrationTest extends ServerLauncherRemoteIntegrationTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
index 06c6bd1..ace30d7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
@@ -71,7 +71,7 @@ import com.gemstone.gemfire.test.process.ProcessWrapper;
  * @see com.gemstone.gemfire.distributed.ServerLauncher.Builder
  * @see com.gemstone.gemfire.distributed.ServerLauncher.ServerState
  * @see com.gemstone.gemfire.internal.AvailablePortHelper
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(IntegrationTest.class)
 public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherRemoteIntegrationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
index ac331e2..b8f4a0c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.distributed.ServerLauncher.Command
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings({"deprecation", "unused"})
 @Category(UnitTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index 827091f..f19b09f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * class.  Mostly checks configuration error checking.
  *
  *
- * @since 2.1
+ * @since GemFire 2.1
  */
 @Category(IntegrationTest.class)
 public class InternalDistributedSystemJUnitTest 
@@ -244,7 +244,7 @@ public class InternalDistributedSystemJUnitTest
    * @throws IllegalArgumentException
    *         If <code>locators</code> is malformed
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private void checkLocator(String locator) {
     Properties props = new Properties();
@@ -256,7 +256,7 @@ public class InternalDistributedSystemJUnitTest
    * Tests that both the traditional syntax ("host[port]") and post
    * bug-32306 syntax ("host:port") can be used with locators.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Test
   public void testLocatorSyntax() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ServerLocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ServerLocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ServerLocatorJUnitTest.java
index bb83df9..19fbc42 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ServerLocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ServerLocatorJUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.distributed.internal.ServerLocator
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class ServerLocatorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
index 8af42b6..b3943b4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/SharedConfigurationJUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link SharedConfiguration}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class SharedConfigurationJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/StartupMessageDataJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/StartupMessageDataJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/StartupMessageDataJUnitTest.java
index ee3f99e..6aa4248 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/StartupMessageDataJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/StartupMessageDataJUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests {@link StartupMessageData}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class StartupMessageDataJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java
index ee79e1e..d219ec7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 /**
  * Tests the Collaboration Lock used internally by dlock service.
  *
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 @Category(IntegrationTest.class)
 @Ignore("Test is broken and was named CollaborationJUnitDisabledTest")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantorHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantorHelper.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantorHelper.java
index 2ab6dd6..1e7277e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantorHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantorHelper.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
  * DLockGrantorHelper provides testing operations that are not normally
  * exposed in the DLockGrantor.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class DLockGrantorHelper {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/MembershipManagerHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/MembershipManagerHelper.java
index a433a4a..2c4b1f4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/MembershipManagerHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/MembershipManagerHelper.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * This helper class provides access to membership manager information that
  * is not otherwise public
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class MembershipManagerHelper
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/support/DistributedSystemAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/support/DistributedSystemAdapter.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/support/DistributedSystemAdapter.java
index d0937e5..4f72480 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/support/DistributedSystemAdapter.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/support/DistributedSystemAdapter.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
  * abstract methods when testing.
  * <p/>
  * @see com.gemstone.gemfire.distributed.DistributedSystem
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 public abstract class DistributedSystemAdapter extends DistributedSystem {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/ByteArrayData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/ByteArrayData.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/ByteArrayData.java
index e043978..3f0bb31 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/ByteArrayData.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/ByteArrayData.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream;
  * {@link #getDataOutput()} to get DataInput or DataOutput as needed for
  * testing.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ByteArrayData {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
index 97062e5..775229f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassBuilder.java
@@ -42,7 +42,7 @@ import javax.tools.ToolProvider;
 /**
  * Test framework utility class to programmatically create classes, JARs and ClassLoaders that include the classes.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ClassBuilder implements Serializable {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassPathLoaderTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassPathLoaderTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassPathLoaderTest.java
index d9ad65a..f94baca 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassPathLoaderTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/ClassPathLoaderTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link ClassPathLoader}.
  * 
- * @since 6.5.1.4
+ * @since GemFire 6.5.1.4
  */
 @Category(UnitTest.class)
 public class ClassPathLoaderTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
index 9249afd..273d3c6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/DataSerializableJUnitTest.java
@@ -70,7 +70,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests the functionality of the {@link DataSerializable} class.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @Category(UnitTest.class)
 public class DataSerializableJUnitTest implements Serializable {
@@ -2664,7 +2664,7 @@ public class DataSerializableJUnitTest implements Serializable {
    * Tests that subclasses of well-known data serializer classes are
    * not read back as instances of their superclass.  See bug 32391.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Test
   public void testSubclasses() throws Exception {
@@ -3116,7 +3116,7 @@ public class DataSerializableJUnitTest implements Serializable {
    * A non-<code>DataSerializable</code> class whose instances are
    * data serialized using a <code>Serializer</code>.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   private static class NonDataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
index eadf942..242775e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Integration tests for GemFireStatSampler.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index b70564b..e4c0faa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Unit tests for the JarDeployer class
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JarDeployerDUnitTest extends CacheTestCase {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/NanoTimerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/NanoTimerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/NanoTimerJUnitTest.java
index b017e25..8421b37 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/NanoTimerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/NanoTimerJUnitTest.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for NanoTimer.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class NanoTimerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/SimpleStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SimpleStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SimpleStatSamplerJUnitTest.java
index 2f61847..5d7c9f4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SimpleStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SimpleStatSamplerJUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Integration tests for SimpleStatSampler.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class SimpleStatSamplerJUnitTest extends StatSamplerTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
index f2d4bea..bb15ff2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatArchiveWriterReaderJUnitTest.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * Integration tests for StatArchiveWriter and StatArchiveReader. The tests
  * are very redundant and desperately need refactoring.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class StatArchiveWriterReaderJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
index f0ea81a..f2946b6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerJUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.util.StopWatch;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class StatSamplerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerTestCase.java
index f981063..819a79c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/StatSamplerTestCase.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.util.StopWatch;
 /**
  * Integration TestCase for StatSampler.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class StatSamplerTestCase {
   protected static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/UniqueIdGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/UniqueIdGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/UniqueIdGeneratorJUnitTest.java
index 222d46a..8113099 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/UniqueIdGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/UniqueIdGeneratorJUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
  * Tests UniqueIdGenerator.
- * @since 5.0.2 (cbb5x_PerfScale)
+ * @since GemFire 5.0.2 (cbb5x_PerfScale)
  */
 @Category(UnitTest.class)
 public class UniqueIdGeneratorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
index f17b6c5..c497ae8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/AbstractRegionJUnitTest.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link AbstractRegion}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class AbstractRegionJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 5248eb2..6f18c36 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * do a register interest with key&values and see if we end up with more entries
  * in the client than the eviction limit.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
  public class Bug41957DUnitTest extends ClientServerTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
index 1706a5b..777ef66 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheAdvisorDUnitTest.java
@@ -261,14 +261,14 @@ public class CacheAdvisorDUnitTest extends CacheTestCase {
   }
   
   /** coverage for bug 34255
-   * @since 5.0
+   * @since GemFire 5.0
    */
  public void testRegionClose() throws Exception {
     basicTestClose(Operation.REGION_CLOSE);
   }
 
   /** coverage for bug 34255
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void testRegionLocalDestroy() throws Exception {
     basicTestClose(Operation.REGION_LOCAL_DESTROY);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index f0d00f5..e0cde11 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * Test to verify that each bridge sever creates its own client_messages_region
  * at its start and destroys it when it stops.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 @Category(IntegrationTest.class)
 public class ClientMessagesRegionCreationAndDestroyJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index 20ffd4a..e424011 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Class <code>ClientServerGetAllDUnitTest</code> test client/server getAll.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
  public class ClientServerGetAllDUnitTest extends ClientServerTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CommitFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CommitFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CommitFunction.java
index 051465d..8608b52 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CommitFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CommitFunction.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * it is the user's responsibility to register this function. see
  * {@link FunctionService#registerFunction(Function)}
  * 
- * @since 6.6.1
+ * @since GemFire 6.6.1
  */
 public class CommitFunction implements Function {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 3a49515..48f994b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -67,7 +67,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class DeltaPropagationDUnitTest extends DistributedTestCase {
   private final static Compressor compressor = SnappyCompressor.getDefaultInstance();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
index 9c6f7f4..9669ef6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * A cache and region are created using an xml. The regions are then verified to make sure
  * that all the attributes have been correctly set
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 @Category(IntegrationTest.class)
 public class DiskRegCacheXmlJUnitTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegRecoveryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegRecoveryJUnitTest.java
index e4aa706..4e3beaa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegRecoveryJUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Disk region recovery tests
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 @Category(IntegrationTest.class)
 public class DiskRegRecoveryJUnitTest extends DiskRegionTestingBase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionProperties.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionProperties.java
index 3d5c2f6..8fef377 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionProperties.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionProperties.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
  * A properties object used to create persistent/overflow regions for
  * testing objects
  *  
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public class DiskRegionProperties

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index 75eb9db..bf6267b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionTag;
  * All disk region unit tests extend this base class , common method to be used in
  * all tests are present here.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public class DiskRegionTestingBase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
index d3f28d6..4f5a3e7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistributedCacheTestCase.java
@@ -182,7 +182,7 @@ public abstract class DistributedCacheTestCase
   /**
    * Return the distribution manager associate with the cache
    *
-   * @since 2.1
+   * @since GemFire 2.1
    */
   protected static DistributionManager getDistributionManager() {
     if (cache == null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
index 304711f..38cad55 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/EventTrackerDUnitTest.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * Tests <code>EventTracker</code> management.
  *
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class EventTrackerDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index aae593b..62fae10 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Tests the GridAdvisor
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class GridAdvisorDUnitTest extends DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 929762c..d4581b2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Tests the size of clientUpdateMessageImpl with the size calculated by
  * {@link com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController} for HA overFlow
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class HAOverflowMemObjectSizerDUnitTest extends DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 9df2468..72cf04f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * This is a test verifies region is LIFO enabled by ENTRY COUNT verifies correct stats updating 
  * and faultin is not evicting another entry - not strict LIFO
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 @Category(IntegrationTest.class)
 public class LIFOEvictionAlgoEnabledRegionJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index b8876b2..0460481 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
  * This is a test verifies region is LIFO enabled by MEMORY verifies correct
  * stats updating and faultin is not evicting another entry - not strict LIFO
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/NestedTransactionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/NestedTransactionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/NestedTransactionFunction.java
index edf259c..b02c6fe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/NestedTransactionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/NestedTransactionFunction.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * {@link FunctionService#registerFunction(Function)}
  * 
  * @see CommitFunction
- * @since 6.6.1
+ * @since GemFire 6.6.1
  *
  */
 public class NestedTransactionFunction implements Function {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index 6920e05..3fb883b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Performs eviction stat dunit tests for off-heap regions.
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index d08d80b..5dbce01 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Tests PartitionedRegion DataStore currentAllocatedMemory operation.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @Category(IntegrationTest.class)
 public class PRDataStoreMemoryOffHeapJUnitTest extends PRDataStoreMemoryJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index 799ca40..5529981 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
 /**
  * Test all the PartitionedRegion api calls when ConserveSockets is set to false
- * @since 5.0
+ * @since GemFire 5.0
  * @see com.gemstone.gemfire.distributed.DistributedSystem#setThreadsSocketPolicy(boolean)
  */
 public class PartitionedRegionAPIConserveSocketsFalseDUnitTest extends

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 55e52cb..da894a4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests PartitionedRegion localMaxMemory with Off-Heap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class PartitionedRegionLocalMaxMemoryOffHeapDUnitTest extends PartitionedRegionLocalMaxMemoryDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
index b99024b..c0c7529 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestUtilsDUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Confirm that the utils used for testing work as advertised
- * @since 5.0 
+ * @since GemFire 5.0
  *
  */
 public class PartitionedRegionTestUtilsDUnitTest extends

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RollbackFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RollbackFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RollbackFunction.java
index 7a319a2..e49fbec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RollbackFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RollbackFunction.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * it is the user's responsibility to register this function. see
  * {@link FunctionService#registerFunction(Function)}
  * 
- * @since 6.6.1
+ * @since GemFire 6.6.1
  */
 public class RollbackFunction implements Function {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java
index 6bac28b..6bef30b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SimpleDiskRegionJUnitTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Testing methods for SimpleDiskRegion.java api's
  * 
- * @since 5.1
+ * @since GemFire 5.1
  *  
  */
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
index 9474be2..421ab5b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
@@ -39,7 +39,7 @@ import junit.framework.Assert;
  * This class tests the response of GemFire to various
  * occurrences of {@link VirtualMachineError}
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class SystemFailureDUnitTest extends DistributedCacheTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
index 6c53855..8bb6bca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * correctly on it after various other operations have been applied on it
  * (Including destroy when entry is a {@link Tombstone}).
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  *
  */
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PerformanceTestFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PerformanceTestFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PerformanceTestFunction.java
index 180ec52..eecaa65 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PerformanceTestFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PerformanceTestFunction.java
@@ -35,7 +35,7 @@ public class PerformanceTestFunction extends FunctionAdapter {
 
   /**
    *  Application execution implementation
-   *  @since 5.8Beta
+   *  @since GemFire 5.8Beta
    */
   public void execute(FunctionContext context) {
     if (context instanceof RegionFunctionContext) {
@@ -59,7 +59,7 @@ public class PerformanceTestFunction extends FunctionAdapter {
   /**
    * Get the function identifier, used by clients to invoke this function
    * @return an object identifying this function
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public String getId() {
     return getClass().getName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
index ad98e0b..4ac2abb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPointJUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link SimpleExtensionPoint}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class SimpleExtensionPointJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtension.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtension.java
index bc0f3f4..8e721d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtension.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtension.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * Base class for Mock Extension.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public abstract class AbstractMockExtension<T> implements Extension<T> {
   public AtomicInteger beforeCreateCounter = new AtomicInteger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
index e28dda7..e61772d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AbstractMockExtensionXmlGenerator.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * Base class for Mock Extension XML Generators.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public abstract class AbstractMockExtensionXmlGenerator<T> implements XmlGenerator<T> {
   public final AbstractMockExtension<T> extension;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
index fc38630..c650c53 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * Function to create {@link MockCacheExtension} on a {@link Region}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class AlterMockCacheExtensionFunction extends FunctionAdapter {
 
@@ -81,7 +81,7 @@ public class AlterMockCacheExtensionFunction extends FunctionAdapter {
   /**
    * @param value
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
     return new Object[] { value };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
index fce61ca..f15652e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * </dl>
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class AlterMockRegionExtensionFunction extends FunctionAdapter {
 
@@ -95,7 +95,7 @@ public class AlterMockRegionExtensionFunction extends FunctionAdapter {
    * @param regionName
    * @param value
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName, final String value) {
     return new Object[] { regionName, value };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
index 767079f..591df73 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * Function to create {@link MockCacheExtension} on a {@link Region}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class CreateMockCacheExtensionFunction extends FunctionAdapter {
 
@@ -78,7 +78,7 @@ public class CreateMockCacheExtensionFunction extends FunctionAdapter {
   /**
    * @param value
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
     return new Object[] { value };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
index 224f407..68783cc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * </dl>
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class CreateMockRegionExtensionFunction extends FunctionAdapter {
 
@@ -92,7 +92,7 @@ public class CreateMockRegionExtensionFunction extends FunctionAdapter {
    * @param regionName
    * @param value
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName, final String value) {
     return new Object[] { regionName, value };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
index 0480017..2163830 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * Function to create {@link MockCacheExtension} on a {@link Region}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class DestroyMockCacheExtensionFunction extends FunctionAdapter {
 
@@ -80,7 +80,7 @@ public class DestroyMockCacheExtensionFunction extends FunctionAdapter {
   /**
    * @param value
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
     return new Object[] { value };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
index e4fa939..6fad890 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * </dl>
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class DestroyMockRegionExtensionFunction extends FunctionAdapter {
 
@@ -90,7 +90,7 @@ public class DestroyMockRegionExtensionFunction extends FunctionAdapter {
   /**
    * @param regionName
    * @return
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName) {
     return new Object[] { regionName };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
index 5b626b3..8e3346c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtension.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * </dl>
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class MockCacheExtension extends AbstractMockExtension<Cache> {
   public MockCacheExtension(final String value) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
index 8384f4c..f372300 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockCacheExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * {@link MockCacheExtension} {@link XmlGenerator}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class MockCacheExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Cache> {
   public MockCacheExtensionXmlGenerator(MockCacheExtension extension) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionCommands.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionCommands.java
index 7aa207f..2c20e23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionCommands.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionCommands.java
@@ -47,7 +47,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * Mock Extension gfsh commands.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class MockExtensionCommands implements CommandMarker {
 
@@ -77,7 +77,7 @@ public class MockExtensionCommands implements CommandMarker {
    *          {@link String} value to set on
    *          {@link MockRegionExtension#setValue(String)}.
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = CREATE_MOCK_REGION_EXTENSION)
   @CliMetaData(writesToSharedConfiguration = true)
@@ -98,7 +98,7 @@ public class MockExtensionCommands implements CommandMarker {
    *          {@link String} value to set on
    *          {@link MockRegionExtension#setValue(String)}.
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = ALTER_MOCK_REGION_EXTENSION)
   @CliMetaData(writesToSharedConfiguration = true)
@@ -117,7 +117,7 @@ public class MockExtensionCommands implements CommandMarker {
    *          {@link Region} name on which to create {@link MockRegionExtension}
    *          .
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = DESTROY_MOCK_REGION_EXTENSION)
   @CliMetaData(writesToSharedConfiguration = true)
@@ -134,7 +134,7 @@ public class MockExtensionCommands implements CommandMarker {
    *          {@link String} value to set on
    *          {@link MockCacheExtension#setValue(String)}.
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = CREATE_MOCK_CACHE_EXTENSION)
   @CliMetaData(writesToSharedConfiguration = true)
@@ -150,7 +150,7 @@ public class MockExtensionCommands implements CommandMarker {
    *          {@link String} value to set on
    *          {@link MockCacheExtension#setValue(String)}.
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = ALTER_MOCK_CACHE_EXTENSION)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
@@ -163,7 +163,7 @@ public class MockExtensionCommands implements CommandMarker {
    * Destroy a {@link MockCacheExtension}.
    * 
    * @return {@link Result}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @CliCommand(value = DESTROY_MOCK_CACHE_EXTENSION)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
@@ -184,7 +184,7 @@ public class MockExtensionCommands implements CommandMarker {
    * @param args
    *          Arguments to pass to function.
    * @return {@link TabularResultData}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   protected Result executeFunctionOnAllMembersTabulateResultPersist(final Function function, final boolean addXmlElement, final Object... args) {
     final Cache cache = CacheFactory.getAnyInstance();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
index 01f8b0a..5b96e3d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockExtensionXmlParser.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlParser;
  * Mock Extension {@link XmlParser}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class MockExtensionXmlParser extends AbstractXmlParser {
   public static final String ATTRIBUTE_VALUE = "value";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
index ddad7c1..0983122 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtension.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * Mock Extension for {@link Region}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class MockRegionExtension extends AbstractMockExtension<Region<?, ?>> {
   public MockRegionExtension(final String value) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
index 64cb9ed..09de7b8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/extension/mock/MockRegionExtensionXmlGenerator.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * {@link MockRegionExtension} {@link XmlGenerator}.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class MockRegionExtensionXmlGenerator extends AbstractMockExtensionXmlGenerator<Region<?, ?>> {
   public MockRegionExtensionXmlGenerator(MockRegionExtension extension) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java
index e789973..d1b1aa5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/functions/TestFunction.java
@@ -116,7 +116,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
   /**
    * Application execution implementation
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   @Override
   public void execute(FunctionContext context) {
@@ -1094,7 +1094,7 @@ public class TestFunction extends FunctionAdapter implements Declarable2 {
    * Get the function identifier, used by clients to invoke this function
    * 
    * @return an object identifying this function
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   @Override
   public String getId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index fea2bf1..79ad0de 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * Test to verify correct propagation of EventID from server to client
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public class HAEventIdPropagationDUnitTest extends DistributedTestCase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index dcbd38a..5772406 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -66,7 +66,7 @@ import util.TestException;
  * This DUnit contains various tests to ensure new implementation of ha region
  * queues works as expected.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public class HARQueueNewImplDUnitTest extends DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index 478f73f..5f3c9cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * Test to verify correct propagation of operations eventID's for put all
  *
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public class PutAllDUnitTest extends DistributedTestCase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java
index 720e242..e21e780 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/Bug40396DUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test delta propagation for faulty delta implementation
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class Bug40396DUnitTest extends DistributedTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index 108c649..c48482c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -520,7 +520,7 @@ public class CacheServerTestUtil extends DistributedTestCase
   }
   /**
    * Enables the shuffling of endpoints for a client
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void enableShufflingOfEndpoints()
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 936e0d2..1eb2700 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
  * This test verifies the per-client queue conflation override functionality
  * Taken from the existing ConflationDUnitTest.java and modified.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ClientConflationDUnitTest extends DistributedTestCase
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index f8493d4..a4ab3c1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -55,7 +55,7 @@ import com.jayway.awaitility.Awaitility;
  * functionality along with register interest new receiveValues flag.
  * Taken from the existing ClientConflationDUnitTest.java and modified.
  *
- * @since 6.0.3
+ * @since GemFire 6.0.3
  */
 public class ClientInterestNotifyDUnitTest extends DistributedTestCase
 {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
index b40e02c..f3852a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionHelper.java
@@ -70,7 +70,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * </pre>
  *
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * @see FunctionService#onRegion(Region)
  */
 public final class PartitionRegionHelper {
@@ -84,7 +84,7 @@ public final class PartitionRegionHelper {
    * @param r a partitioned Region
    * @throws IllegalStateException if the Region is not a {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable map of {@linkplain Region#getFullPath() region name} to {@link Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Map<String, Region<?, ?>> getColocatedRegions(final Region<?, ?> r) {
     Map ret;
@@ -119,7 +119,7 @@ public final class PartitionRegionHelper {
    * 
    * @param r
    * @return true if it is a partitioned Region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static boolean isPartitionedRegion(final Region<?,?> r) {
     if (r == null) {
@@ -136,7 +136,7 @@ public final class PartitionRegionHelper {
    * @param r
    * @throws IllegalStateException
    * @return PartitionedRegion if it is a partitioned Region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private static PartitionedRegion isPartitionedCheck(final Region<?,?> r) {
     if (! isPartitionedRegion(r)) {
@@ -153,7 +153,7 @@ public final class PartitionRegionHelper {
    *
    * @param cache the cache which has the regions
    * @return set of details about all locally defined partitioned regions
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Set<PartitionRegionInfo> getPartitionRegionInfo(
       final Cache cache) {
@@ -169,7 +169,7 @@ public final class PartitionRegionHelper {
    * 
    * @param region the region to get info about
    * @return details about the specified partitioned region
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static PartitionRegionInfo getPartitionRegionInfo(
       final Region<?,?> region) {
@@ -218,7 +218,7 @@ public final class PartitionRegionHelper {
    * @throws IllegalStateException
    *          if the provided region is something other than a
    *         {@linkplain DataPolicy#PARTITION partitioned Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static void assignBucketsToPartitions(Region<?,?> region) {
     PartitionedRegion pr = isPartitionedCheck(region);
@@ -263,7 +263,7 @@ public final class PartitionRegionHelper {
    *         if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return the primary member for the key, possibly null if a primary is not yet determined
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> DistributedMember getPrimaryMemberForKey(final Region<K,V> r, final K key) {
     PartitionedRegion pr = isPartitionedCheck(r);
@@ -289,7 +289,7 @@ public final class PartitionRegionHelper {
    *        if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable set of members minus the primary
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Set<DistributedMember> getRedundantMembersForKey(final Region<K,V> r, final K key) {
     DistributedMember primary = getPrimaryMemberForKey(r, key);
@@ -312,7 +312,7 @@ public final class PartitionRegionHelper {
    *         if the provided region is something other than a
    *        {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable set of all members
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Set<DistributedMember> getAllMembersForKey(final Region<K,V> r, final K key) {
     return Collections.unmodifiableSet(getAllForKey(r, key));
@@ -335,7 +335,7 @@ public final class PartitionRegionHelper {
    * @param c the region function context
    * @throws IllegalStateException if the Region is not a {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return an unmodifiable map of {@linkplain Region#getFullPath() region name} to {@link Region}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Map<String, Region<?, ?>> getLocalColocatedRegions(final RegionFunctionContext c) {
     final Region r = c.getDataSet();
@@ -364,7 +364,7 @@ public final class PartitionRegionHelper {
    *           if {@link RegionFunctionContext#getDataSet()} returns something
    *           other than a {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return a Region for efficient reads
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K, V> Region<K, V> getLocalDataForContext(final RegionFunctionContext c) {
     final Region r = c.getDataSet();
@@ -384,7 +384,7 @@ public final class PartitionRegionHelper {
    *                 if the provided region is something other than a
    *                 {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return a Region for efficient reads
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static <K,V> Region<K,V> getLocalData(final Region<K,V> r) {
     if (isPartitionedRegion(r)) {
@@ -415,7 +415,7 @@ public final class PartitionRegionHelper {
    *           if the provided region is something other than a
    *           {@linkplain DataPolicy#PARTITION partitioned Region}
    * @return a Region for efficient reads
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static <K,V> Region<K,V> getLocalPrimaryData(final Region<K,V> r) {
     if (isPartitionedRegion(r)) {
@@ -470,7 +470,7 @@ public final class PartitionRegionHelper {
    *           destination already hosts a copy of the bucket, or if the bucket
    *           does not exist.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */
    public static <K> void moveBucketByKey(Region<K,?> region, DistributedMember source, DistributedMember destination, K key) {
      PartitionedRegion pr = isPartitionedCheck(region);
@@ -524,7 +524,7 @@ public final class PartitionRegionHelper {
    * @return A RebalanceResult object that contains information about what what
    *         data was actually moved.
    * 
-   * @since 7.1
+   * @since GemFire 7.1
    */
    public static RebalanceResults moveData(Region<?,?> region, DistributedMember source, DistributedMember destination, float percentage) {
      PartitionedRegion pr = isPartitionedCheck(region);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
index 90d9547..223e5cd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRegionInfo.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * <p>
  * This is an immutable snapshot of the information.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface PartitionRegionInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
index f9fa1b0..f65ffc8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/ConflictingPersistentDataException.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.admin.AdminDistributedSystem;
  * persistent files are completely different. In that case, gemfire throws this
  * exception rather than discarding one of the sets of persistent files.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ConflictingPersistentDataException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
index c1ba16a..20d2a50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PartitionOfflineException.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.GemFireException;
  * the region (such as a put), it is possible that the change was actually
  * persisted to disk before the member went offline.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public class PartitionOfflineException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
index 900dda4..d0169dc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentID.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache.DataPolicy;
  * members are waiting for. See
  * {@link AdminDistributedSystem#getMissingPersistentMembers()}
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public interface PersistentID extends DataSerializable {
@@ -52,7 +52,7 @@ public interface PersistentID extends DataSerializable {
   
   /**
    * The unique identifier for the persistent data.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public abstract UUID getUUID();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
index 4fcf911..f53ecb1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/PersistentReplicatesOfflineException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.GemFireException;
  * If you see this exception you should restart members that are
  * configured for hosting persistent replicates.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class PersistentReplicatesOfflineException extends GemFireException {
   private static final long serialVersionUID = 6209644027346609970L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
index a1d2576..5d3bcde 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokeFailedException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.GemFireException;
  * with that persistent ID is currently running. You can only revoke
  * members which is not running.
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class RevokeFailedException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
index 305bc66..e9b0d11 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/persistence/RevokedPersistentDataException.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.admin.AdminDistributedSystem;
  * persistent files are removed. See
  * {@link AdminDistributedSystem#revokePersistentMember(java.net.InetAddress, String)}
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RevokedPersistentDataException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
index 9995b56..3e54278 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/AmbiguousNameException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * more than one object in scope or if there is more than one maximally specific
  * overridden method in a class.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class AmbiguousNameException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
index aaffb3f..7a70d61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributes.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  * 
  * For compatibility rules and default values, see {@link CqAttributesFactory}.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqAttributes {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
index 71988d5..101c9e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesFactory.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  *
  * @see CqAttributes
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CqAttributesFactory {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
index d065e76..05f64e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqAttributesMutator.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * Each CqQuery has an CqAttributesMutator interface which supports modification 
  * of certain CQ attributes after the CQ has been created. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqAttributesMutator {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
index a1afc30..3adb761 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqClosedException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
 /**
  * Thrown if the CqQuery on which the operation performed is closed.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
index 41e5c80..dccb383 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqEvent.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.Operation;
  * event. 
  * The CqEvent is not an extension of CacheEvent. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqEvent {
   
@@ -85,7 +85,7 @@ public interface CqEvent {
    * If there is no delta, returns null. New value may still be available.
    * 
    * @return byte[] delta value.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public byte[] getDeltaValue();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
index 28265f9..0f0f2fd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown during continuous query creation, execution time.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
index ba08436..66ffd08 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqExistsException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 
 /**
  * Thrown if a CQ by this name already exists on this client 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public class CqExistsException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
index 5dddcd2..b68d976 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.CacheCallback;
  * is an event satisfied by the CQ and the other called when there is an 
  * error during CQ processing. 
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqListener extends CacheCallback {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
index f7b694d..691a7d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqQuery.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  * The methods allow you to retrieve CQ related information, operate on CQ
  * like execute, stop, close and get the state of the CQ.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqQuery {
@@ -147,7 +147,7 @@ public interface CqQuery {
   /**
    * This allows to check if the CQ is durable.
    * @return boolean true if durable, false otherwise
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public boolean isDurable();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
index 2bd5c2b..f11e4e5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqResults.java
@@ -44,7 +44,7 @@ package com.gemstone.gemfire.cache.query;
  * @see com.gemstone.gemfire.cache.query.Query#execute()
  * @see com.gemstone.gemfire.cache.query.CqQuery#executeWithInitialResults()
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface CqResults<E> extends SelectResults<E> {
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
index ccdc1a5..b1477f2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqServiceStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This class provides methods to get aggregate statistical information 
  * about the CQs of a client.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqServiceStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
index fab0579..0ade80d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqState.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This interface gives information on the state of a CqQuery. 
  * It is provided by the getState method of the CqQuery instance. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public interface CqState {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
index f6ccf44..1189179 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * This class provides methods to get statistical information about a registered Continuous Query (CQ)
  * represented by the CqQuery object. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface CqStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
index 9e86130..0f1e372 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/CqStatusListener.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.query;
  *  the cq is disconnected
  * 
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 public interface CqStatusListener extends CqListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
index 8b220ea..d6fe92d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/FunctionDomainException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if the domain of a function is not legal.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class FunctionDomainException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
index 7d13aec..56593f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Index.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.cache.*;
  * @see QueryService#createIndex(String, IndexType, String, String)
  * @see IndexType
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface Index {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
index c8972cf..5a0c317 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexExistsException.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown while creating the new index if there exists an Index with
  * the same definition as new index.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexExistsException extends QueryException{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
index d82c9ce..0426cd1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexInvalidException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown if the index definition is not valid.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexInvalidException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
index 7a5329c..3dda5b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexMaintenanceException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * Thrown if an error occurs while updating query indexes during
  * region modification.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class IndexMaintenanceException extends CacheRuntimeException {
 private static final long serialVersionUID = 3326023943226474039L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
index 6b37fd7..a4b13ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexNameConflictException.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown while creating the new index if there exists an Index with
  * the same name as new index.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class IndexNameConflictException extends QueryException{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
index b105af4..1148b61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexStatistics.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Provides statistics about a GemFire cache {@link Index}.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface IndexStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
index ab04a0f..362de5a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/IndexType.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * 
  * Enumerated type for types of {@linkplain Index indexes}
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class IndexType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
index c592889..42563fc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/MultiIndexCreationException.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
  *   <li>{@link IndexInvalidException}</li>
  *   <li>{@link UnsupportedOperationException}</li>
  * </ul>
- * @since 8.1
+ * @since GemFire 8.1
  * 
  */
 public class MultiIndexCreationException extends Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
index 1da09e4..aad2ec3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameNotFoundException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown when an attribute or method name could not be resolved during query
  * execution because no matching method or field could be found.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class NameNotFoundException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
index 492892c..ffb5c16 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/NameResolutionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if an attribute or method name in a query cannot be resolved.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class NameResolutionException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
index 990cdae..c91dceb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/ParameterCountInvalidException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query;
  * Thrown when the number of bound paramters for a query does not match the
  * number of placeholders.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ParameterCountInvalidException extends QueryException {
 private static final long serialVersionUID = -3249156440150789428L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
index 0329a70..fdd71b0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Query.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
  * Interface for query objects. Supports execution of queries with optional
  * parameters.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public interface Query {
@@ -188,7 +188,7 @@ public interface Query {
    *    Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where
    *    p1.field = p2.field [AND .....]
    *    
-   * @since 6.2.2
+   * @since GemFire 6.2.2
    * @param context RegionFunctionContext which will target the query on subset
    *          of data if executed on PartitionedRegion.
    *
@@ -257,7 +257,7 @@ public interface Query {
    *    Select * from /partitionRegion1 p1, /PartitionRegion2 p2 where
    *    p1.field = p2.field [AND .....]
    *    
-   * @since 6.2.2        
+   * @since GemFire 6.2.2
    * @param context RegionFunctionContext which will target the query on subset
    *          of data if executed on PartitionedRegion.
    * @param params Values that are bound to parameters (such as <code>$1</code>)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
index a9638c7..3ddd320 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
 /**
  * Thrown during by the query engine during parsing or execution.
  * Instances of subclasses are thrown for more specific exceptions.
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
index ab33482..c0ba18d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionLowMemoryException.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * from sending out QueryExecutionLowMemoryExeceptions at the risk of
  * a query exhausting all memory.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionLowMemoryException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
index 9f91b21..a8689bb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryExecutionTimeoutException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * The Max query execution time is set using the system  variable 
  * gemfire.Cache.MAX_QUERY_EXECUTION_TIME. 
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class QueryExecutionTimeoutException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
index b095973..0f6116e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvalidException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown if the query language syntax is not valid.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class QueryInvalidException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
index d27494a..47aea3c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryInvocationTargetException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if an exception is thrown when a method is invoked during query execution.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class QueryInvocationTargetException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
index 3a98a43..28646a4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.cache.query.internal.Undefined;
  * using {@link Cache#getQueryService}.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface QueryService {
 
@@ -629,7 +629,7 @@ public interface QueryService {
    * Constructs a new continuous query, represented by an instance of
    * CqQuery. The CqQuery is not executed until the execute method
    * is invoked on the CqQuery.
-   * @since 5.5
+   * @since GemFire 5.5
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
    * @return the newly created CqQuery object
@@ -654,7 +654,7 @@ public interface QueryService {
    * CqQuery. The CqQuery is not executed until the execute method
    * is invoked on the CqQuery.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
    * @param isDurable true if the CQ is durable
@@ -680,7 +680,7 @@ public interface QueryService {
    * is invoked on the CqQuery. The name of the query will be used
    * to identify this query in statistics archival.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param name the String name for this query
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
@@ -711,7 +711,7 @@ public interface QueryService {
    * is invoked on the CqQuery. The name of the query will be used
    * to identify this query in statistics archival.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @param name the String name for this query
    * @param queryString the OQL query
    * @param cqAttr the CqAttributes
@@ -741,7 +741,7 @@ public interface QueryService {
    * Any attempt to access closed CqQuery objects will result in the 
    * CqClosedException being thrown to the caller.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void closeCqs();
 
@@ -749,7 +749,7 @@ public interface QueryService {
    * Retrieve all registered Continuous Queries.
    * This is a collection of CqQuery objects.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqQuery[] list of registered CQs,
    *         null if there are no CQs.   
    */
@@ -759,7 +759,7 @@ public interface QueryService {
    * Retrieves all the registered Continuous Queries for a given region.
    * This is a collection of CqQuery objects. 
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqQuery[] list of registered CQs on the specified region,
    *         null if there are no CQs.
    * @exception CqException
@@ -770,7 +770,7 @@ public interface QueryService {
   /**
    * Retrieves the Continuous Query specified by the name.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @param  cqName - String, name of the CQ
    * @return  CqQuery object, 
    *          null if no CqQuery object is found.
@@ -782,7 +782,7 @@ public interface QueryService {
    * This is complementary to stopCqs.
    * @see QueryService#stopCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
   public void executeCqs() throws CqException;
@@ -793,7 +793,7 @@ public interface QueryService {
    * bulk region operations.
    * @see QueryService#executeCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQ.
    */
   public void stopCqs() throws CqException;
@@ -804,7 +804,7 @@ public interface QueryService {
    * This is complementary method to stopCQs().  
    * @see  QueryService#stopCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to stop CQs.
    */
   public void executeCqs(String regionName) throws CqException;
@@ -816,7 +816,7 @@ public interface QueryService {
    * bulk region operations.
    * @see QueryService#executeCqs()
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @throws CqException if failure to execute CQs.
    */  
   public void stopCqs(String regionName) throws CqException;
@@ -824,7 +824,7 @@ public interface QueryService {
   /**
    * Retrieves all the durable CQs registered by the client calling this method. 
    *
-   * @since 7.0
+   * @since GemFire 7.0
    * @return List of names of registered durable CQs,
    *         empty list if no durable cqs.   
    */
@@ -842,7 +842,7 @@ public interface QueryService {
    *    
    * @see CqServiceStatistics
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    * @return CqServiceStatistics
    * 
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
index 5c5dc04..c305573 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/QueryStatistics.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query;
  * Provides statistical information about a query performed on a
  * GemFire <code>Region</code>.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface QueryStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
index 56a8fe3..a52f54c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/RegionNotFoundException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if a region referenced by name in a query cannot be found.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class RegionNotFoundException extends NameResolutionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
index 821d4a2..b7359e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/SelectResults.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.cache.query.types.*;
  *
  * @see com.gemstone.gemfire.cache.query.Query#execute()
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface SelectResults<E> extends Collection<E> {  
   
@@ -81,7 +81,7 @@ public interface SelectResults<E> extends Collection<E> {
    * collection, then 0 is returned.
    * @param element the element
    * @return the number of occurrances of element
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public int occurrences(E element);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
index a844e4f..8ff6a15 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/Struct.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.query.types.StructType;
  *
  * @see SelectResults
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface Struct {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
index ca2c773..6c6e0aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/TypeMismatchException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.query;
 /**
  * Thrown if type consistency is violated while a query is being executed.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public class TypeMismatchException extends QueryException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
index 7e88c1b..15ca6bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/Bag.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see StructBag
  * @see SortedResultsBag
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public abstract class Bag<E> extends AbstractCollection<E> implements
     CqResults<E> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
index d214f09..241170f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledLike.java
@@ -486,7 +486,7 @@ public class CompiledLike extends CompiledComparison
   }
   
   /**
-   * @since 6.6
+   * @since GemFire 6.6
    */
   @Override
   protected PlanInfo protGetPlanInfo(ExecutionContext context)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
index 7c6de42..f01a6cb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSelect.java
@@ -665,7 +665,7 @@ public class CompiledSelect extends AbstractCompiledValue {
    * whereclause.
    * @param collExpr 
    * @throws RegionNotFoundException 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   private int getRegionIteratorSize(ExecutionContext context,
       CompiledValue collExpr) throws RegionNotFoundException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
index 2b6aa63..bba284b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqEntry.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.Version;
 /**
  * This represents the CQ key value pair for the CQ query results.
  *  
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public class CqEntry implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
index 30af78d..e9d30d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqQueryVsdStats.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 /**
  * This class tracks GemFire statistics related to a {@link com.gemstone.gemfire.cache.query.CqQuery}.
  * 
- * @since 5.5 
+ * @since GemFire 5.5
  */
 public class CqQueryVsdStats
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
index 173ac3d..17c7099 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CqStateImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.query.CqState;
 /**
  * Offers methods to get CQ state.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 
 public class CqStateImpl implements CqState {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
index 15c37f5..18514a1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/HashingStrategy.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
  * in a HashMap(OR HashSet) for calculation of hash-code for
  * custom objects and primitive types.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  *
  */
 public interface HashingStrategy extends Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
index ccf4540..4d21d29 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/NullToken.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.Version;
 
 /**
  * A Token representing null.
- * @since cedar
+ * @since GemFire cedar
  *
  */
 public class NullToken implements DataSerializableFixedID, Comparable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
index 1beb07c..f42416a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/PlanInfo.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.query.internal;
  * Encapsulates evaluation info about compiled values
  * 
  * @version $Revision: 1.1 $
- * @since 4.1
+ * @since GemFire 4.1
  */
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
index 60ab9b4..21274c1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ProxyQueryService.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * multiuser-authentication attribute is set to true.
  * 
  * @see ProxyCache
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ProxyQueryService implements QueryService {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
index 4e98f3e..052200f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QRegion.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class QRegion implements SelectResults {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
index 8015a00..e863004 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionCanceledException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
  * Due to various threads using the method, access to the query object may not be available for certain threads
  * This exception is generically used and caught by DefaultQuery, which will then throw the appropriate exception
 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionCanceledException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
index 7c97ca8..25ec088 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutionContext.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
  * is a bit heavt-weight context whose life is longer in JVM than
  * {@link ExecutionContext} which will be used ONLY for index updates.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class QueryExecutionContext extends ExecutionContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
index 0b1a465..6084d23 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryExecutor.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.query.TypeMismatchException;
  * An interface allowing different Region implementations to support 
  * querying. 
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface QueryExecutor {
   //TODO Yogesh , fix this signature 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
index 2c6a0dd..d4ca1a9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/QueryMonitor.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * The QueryMonitor cancels a query-execution thread if its taking more than
  * the max time. 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class QueryMonitor implements Runnable {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
index 25b3129..f9ba2f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionCopyOnReadWrapper.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.cache.query.types.ObjectType;
  * toSet, toList, toArray and toArray(Object[] a) will create new structures that will iterate through
  * the results using a SelectResultsCopyOnReadIterator.  The new structures will then have a copy of the values.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class ResultsCollectionCopyOnReadWrapper implements SelectResults {
   SelectResults results;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
index 7c01a94..6f35770 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsCollectionWrapper.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.Version;
  * collection is a List; duplicates allowed unless base collection is a Set.
  * Defaults to modifiable unless set otherwise.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class ResultsCollectionWrapper
   implements SelectResults, DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
index bea9e53..2d513bf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/ResultsSet.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Implementation of SelectResults that extends HashSet
  * If the elements are Structs, then use a StructSet instead.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class ResultsSet  extends HashSet implements SelectResults,
  DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
index 0c31c45..f30e865 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedResultSet.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.Version;
  * version of ResultSet used for order by clause If the elements are Structs,
  * then use SortedStructSet instead.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class SortedResultSet extends TreeSet implements SelectResults, Ordered, 
     DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
index 73f2109..b165e0e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/SortedStructSet.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.Version;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class SortedStructSet extends TreeSet implements SelectResults,
     DataSerializableFixedID, Ordered, StructFields {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
index 81d46a5..03439a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructBag.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class StructBag extends ResultsBag implements StructFields {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
index 5afb90d..673a84e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
 
 /**
  * Implementation of Struct
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class StructImpl
   implements Struct, DataSerializableFixedID, Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
index 9d95a98..af2dbe7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/StructSet.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * The values in this set are stored as Object[] and get wrapped in Structs as
  * necessary.
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class StructSet /*extends ObjectOpenCustomHashSet*/ implements Set, SelectResults, 
 DataSerializableFixedID, StructFields {
@@ -107,7 +107,7 @@ DataSerializableFixedID, StructFields {
 
   /** Creates a StructSet directly from a StructBag;
    *  (internal use) 
-   *  @since 5.1
+   *  @since GemFire 5.1
    */
   StructSet(StructBag bag) {
     this.contents = new ObjectOpenCustomHashSet(new ObjectArrayHashingStrategy());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
index de35699..d0a0ee5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndex.java
@@ -83,7 +83,7 @@ import com.gemstone.gemfire.pdx.internal.PdxString;
  * 
  * Currently this implementation only supports an index on a region path.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class CompactRangeIndex extends AbstractIndex {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
index fdb42e6..95a2613 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexConcurrentHashSet.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.concurrent.CompactConcurrentHashSet2;
  * segments for accurate count.
  * 
  * @param <E>
- * @since 7.0 
+ * @since GemFire 7.0
  */
 public class IndexConcurrentHashSet<E> extends CompactConcurrentHashSet2<E> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
index 9c5d8e6..3cf4cbf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexElemArray.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  * A wrapper around an object array for storing values in index data structure
  * with minimal set of operations supported and the maximum size of 128 elements  
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class IndexElemArray implements Iterable, Collection {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
index 6653d32..77941b6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStats.java
@@ -196,7 +196,7 @@ public class IndexStats {
    * com.gemstone.gemfire.internal.cache.GemFireCacheImpl#close cache} 
    * is closed.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   void close() {
     this.stats.close();
@@ -205,7 +205,7 @@ public class IndexStats {
   /**
    * Returns whether or not these stats have been closed
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public boolean isClosed() {
     return this.stats.isClosed();
@@ -214,7 +214,7 @@ public class IndexStats {
 
   /**
    * Returns the Statistics instance that stores the cache perf stats.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Statistics getStats() {
     return this.stats;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
index fa425cf..795939a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexStore.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface IndexStore {
 
@@ -54,8 +54,8 @@ public interface IndexStore {
    */
   public void updateMapping(Object indexKey, Object oldKey, RegionEntry re, Object oldValue)
       throws IMQException;
-
-  public String printAll();
+
+  public String printAll();
   
   /**
    * Return all of the IndexStoreEntries that map to a given region key.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
index 3f9a538..83f8c02 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/MemoryIndexStore.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.cache.persistence.query.CloseableIterator;
 /**
  * The in-memory index storage
  * 
- * @since 8.0 
+ * @since GemFire 8.0
  */
 public class MemoryIndexStore implements IndexStore {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
index 255f79a..da25ee3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * This class implements a Partitioned index over a group of partitioned region
  * buckets.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public class PartitionedIndex extends AbstractIndex

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
index 6b283d0..3fd3069 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHint.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 8.1
+ * @since GemFire 8.1
  *
  */
 public class ASTHint extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
index 5587bb6..0b0182e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTHintIdentifier.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 8.1
+ * @since GemFire 8.1
  *
  */
 public class ASTHintIdentifier extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
index 6d52330..4528e8b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/parse/ASTTrace.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.internal.QCompiler;
 
 /**
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  *
  */
 public class ASTTrace extends GemFireAST {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
index 682ae95..f8f4b50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/CollectionTypeImpl.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.query.types.*;
 
 /**
  * Implementation of CollectionType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CollectionTypeImpl extends ObjectTypeImpl implements CollectionType {
   private static final long serialVersionUID = 892402666471396897L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
index 9888104..4943e97 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/MapTypeImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.DataSerializer;
 
 /**
  * Implementation of CollectionType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class MapTypeImpl extends CollectionTypeImpl
 implements MapType {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
index b41da46..9ea5d63 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/ObjectTypeImpl.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.Version;
 
 /**
  * Implementation of ObjectType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class ObjectTypeImpl implements ObjectType, DataSerializableFixedID {
   private static final long serialVersionUID = 3327357282163564784L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
index dfa9cc0..1b7aa50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/types/StructTypeImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * Implementation of StructType
- * @since 4.0
+ * @since GemFire 4.0
  */
 public final class StructTypeImpl extends ObjectTypeImpl implements StructType {
   private static final long serialVersionUID = -6368710865627039204L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
index 2d865ce..ad2ddaf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/types/CollectionType.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.query.types;
  * Represents the type of a collection, an object that can contain element
  * objects.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface CollectionType extends ObjectType {
   



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaEOFException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaEOFException.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaEOFException.java
index ba0cd51..c5a5fdf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaEOFException.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaEOFException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 /**
  * Faulty delta implementation, raising EndOfFile exception as
  * fromDelta reads more fields then wrote by toDelta
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class DeltaEOFException extends FaultyDelta {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
index 1e37009..4936053 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectAutoDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  *
  * Test reconnecting a durable client that is using
  * the locator to discover its servers

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index bd4f94a..5fcdd67 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**      
  * Tests for durable reconnect issue
  * 
- * @since 5.2   
+ * @since GemFire 5.2
  */
 
 public class DurableClientReconnectDUnitTest extends DistributedTestCase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 2163610..ed9236b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
  * Tests that the Matris defined in <code>ServerResponseMatrix</code> is
  * applied or not
  * 
- * @since 5.1
+ * @since GemFire 5.1
  * 
  */
 public class DurableResponseMatrixDUnitTest extends DistributedTestCase

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FaultyDelta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FaultyDelta.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FaultyDelta.java
index 7561037..ec82e0e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FaultyDelta.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/FaultyDelta.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 /**
  * Faulty delta implementation, raising ArrayIndexOutOfBound exception as
  * fromDelta reads incorrect sequence then wrote by toDelta
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class FaultyDelta implements Delta, DataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index c4fdded..4e06093 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Runs force invalidate eviction tests with off-heap regions.
- * @since 9.0
+ * @since Geode 1.0
  */
 public class ForceInvalidateOffHeapEvictionDUnitTest extends
     ForceInvalidateEvictionDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
index c86c473..4edbc98 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -146,7 +146,7 @@ public class HAInterestTestCase extends DistributedTestCase {
   /**
    * Return the current primary waiting for a primary to exist.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static VM getPrimaryVM() {
     return getPrimaryVM(null);
@@ -156,7 +156,7 @@ public class HAInterestTestCase extends DistributedTestCase {
    * Return the current primary waiting for a primary to exist and for it not to
    * be the oldPrimary (if oldPrimary is NOT null).
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static VM getPrimaryVM(final VM oldPrimary) {
     WaitCriterion wc = new WaitCriterion() {
@@ -208,7 +208,7 @@ public class HAInterestTestCase extends DistributedTestCase {
   /**
    * Given a server vm (server1, server2, or server3) return its port.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static int getServerPort(VM vm) {
     if (vm == server1) {
@@ -226,7 +226,7 @@ public class HAInterestTestCase extends DistributedTestCase {
   /**
    * Given a server port (PORT1, PORT2, or PORT3) return its vm.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static VM getServerVM(int port) {
     if (port == PORT1) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
index 8b69cd8..f98e01e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractEntityResolverTest.java
@@ -42,7 +42,7 @@ public abstract class AbstractEntityResolverTest {
    * Assert that {@link PivotalEntityResolver} extends
    * {@link DefaultEntityResolver2}.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testInstanceOfDefaultEntityResolver2() {
@@ -54,7 +54,7 @@ public abstract class AbstractEntityResolverTest {
    * Verifies that the META-INF/services file is correctly found and the the
    * implementation class is loadable.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testDiscovery() {
@@ -73,7 +73,7 @@ public abstract class AbstractEntityResolverTest {
    * Resolve the cache.xml XSD using the {@link PivotalEntityResolver}. Verifies
    * that the META-INF/schemas files are correctly found.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testResolveEntity() throws Exception {
@@ -87,7 +87,7 @@ public abstract class AbstractEntityResolverTest {
    * <code>null</code> <code>systemId</code>. Asserts that returns to
    * <code>null<code>.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testResolveEntityNullSystemId() throws SAXException, Exception {
@@ -101,7 +101,7 @@ public abstract class AbstractEntityResolverTest {
    * <code>"--not-a-valid-system-id--"</code> <code>systemId</code>, which is
    * not in the Pivotal namespace.. Asserts that returns to <code>null<code>.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testResolveEntityUnkownSystemId() throws Exception {
@@ -116,7 +116,7 @@ public abstract class AbstractEntityResolverTest {
    * <code>systemId</code>, which should not be found. Asserts that returns to
    * <code>null<code>.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testResolveEntityNotFoundSystemId() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
index 104a706..0c3a89a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParserJUnitTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link AbstractXmlParser}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class AbstractXmlParserJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParserJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
index 88c1adf..71f7e02 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParserJUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Test cases for {@link CacheXmlParser}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class CacheXmlParserJUnitTest {
@@ -53,7 +53,7 @@ public class CacheXmlParserJUnitTest {
    * Asserts that null is returned when no {@link XmlParser} is registered for
    * namespace.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testGetDelegate() {
@@ -82,7 +82,7 @@ public class CacheXmlParserJUnitTest {
   /**
    * Test that {@link CacheXmlParser} falls back to DTD parsing when locale language is not English.
    * 
-   * @since 9.0
+   * @since Geode 1.0
    */
   @Test
   public void testDTDFallbackWithNonEnglishLocal() {
@@ -100,7 +100,7 @@ public class CacheXmlParserJUnitTest {
   /**
    * Get access to {@link CacheXmlParser} protected methods and fields.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static class TestCacheXmlParser extends CacheXmlParser {
 
@@ -121,7 +121,7 @@ public class CacheXmlParserJUnitTest {
 
     /**
      * @return {@link CacheXmlParser} private delegates field.
-     * @since 8.1
+     * @since GemFire 8.1
      */
     @SuppressWarnings("unchecked")
     public HashMap<String, XmlParser> getDelegates() {
@@ -135,7 +135,7 @@ public class CacheXmlParserJUnitTest {
     /**
      * Access to {@link CacheXmlParser} getDelegate(String) method.
      * 
-     * @since 8.1
+     * @since GemFire 8.1
      */
     public XmlParser getDelegate(final String namespaceUri) {
       try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
index 15f3161..6961ed6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersionJUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class CacheXmlVersionJUnitTest {
@@ -36,7 +36,7 @@ public class CacheXmlVersionJUnitTest {
    * "9.0".compareTo("10.0") < 0. Testing that ENUM based solution is ordinal
    * correct for comparisons.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testOrdinal() {
@@ -61,7 +61,7 @@ public class CacheXmlVersionJUnitTest {
    * Test that {@link CacheXmlVersion#valueForVersion(String)} matches the same
    * {@link CacheXmlVersion} via {@link CacheXmlVersion#getVersion()}.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testValueForVersion() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
index 155b051..d4b3d3d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolverJUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * Unit test for {@link PivotalEntityResolver} and
  * {@link DefaultEntityResolver2}.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class PivotalEntityResolverJUnitTest extends AbstractEntityResolverTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreationJUnitTest.java
index 563d55f..73c2ebd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreationJUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit test for {@link RegionCreation}.
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class RegionCreationJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
index 57561bd..9a7b1e2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtilsJUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit Tests for {@link XmlGeneratorUtils}.
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class XmlGeneratorUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
index d91234a..9f6dbf5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionStatsDUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests compression statistics.
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class CompressionStatsDUnitTest extends CacheTestCase {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/io/CompositeOutputStreamJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/io/CompositeOutputStreamJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/io/CompositeOutputStreamJUnitTest.java
index 29725f1..a0322ed 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/io/CompositeOutputStreamJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/io/CompositeOutputStreamJUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for CompositeOutputStream.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class CompositeOutputStreamJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
index abbca4a..ad7159f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/functional/TestXACacheLoader.java
@@ -30,7 +30,7 @@ import javax.transaction.*;
  * the "2" method.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class TestXACacheLoader implements CacheLoader{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ClassUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ClassUtilsJUnitTest.java
index 7780b3e..b84d29a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ClassUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ClassUtilsJUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.internal.lang.ClassUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class ClassUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InOutParameterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InOutParameterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InOutParameterJUnitTest.java
index 267c538..6f3af4b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InOutParameterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InOutParameterJUnitTest.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * <p/>
  * @see com.gemstone.gemfire.internal.lang.InOutParameter
  * @see org.junit.Test
- * @since 6.8
+ * @since GemFire 6.8
  */
 @Category(UnitTest.class)
 public class InOutParameterJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InitializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InitializerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InitializerJUnitTest.java
index 53e6c94..8a28beb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InitializerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/InitializerJUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class InitializerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ObjectUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ObjectUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ObjectUtilsJUnitTest.java
index 7f68a52..b61597a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ObjectUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ObjectUtilsJUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.internal.lang.ObjectUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 6.8
+ * @since GemFire 6.8
  */
 @Category(UnitTest.class)
 public class ObjectUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/StringUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/StringUtilsJUnitTest.java
index 98c9836..714f0a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/StringUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/StringUtilsJUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.internal.lang.StringUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("null")
 @Category(UnitTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/SystemUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/SystemUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/SystemUtilsJUnitTest.java
index d564c2e..5401744 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/SystemUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/SystemUtilsJUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.internal.lang.SystemUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 6.8
+ * @since GemFire 6.8
  */
 @Category(UnitTest.class)
 public class SystemUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ThreadUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ThreadUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ThreadUtilsJUnitTest.java
index c172885..6a0b3fe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ThreadUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/lang/ThreadUtilsJUnitTest.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class ThreadUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/SortLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/SortLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/SortLogFileJUnitTest.java
index 7dfc7d3..1faf956 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/SortLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/SortLogFileJUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests the functionality of the {@link SortLogFile} program.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @Category(UnitTest.class)
 public class SortLogFileJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/ConfigLocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/ConfigLocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/ConfigLocatorJUnitTest.java
index 24916ae..7d61fa0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/ConfigLocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/ConfigLocatorJUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * UnitTest for ConfigLocator which is used to find the Log4J 2 configuration file.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 @Category(IntegrationTest.class)
 public class ConfigLocatorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SocketUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SocketUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SocketUtilsJUnitTest.java
index 4d22a4a..8b42f06 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SocketUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SocketUtilsJUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class SocketUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReaderJUnitTest.java
index 53c78c7..2e0a7a6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReaderJUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * TRAC bug #51967 which is caused by a JDK bug. The test {@link #hangsOnWindows}
  * verifies the existence of the bug.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 @Category(IntegrationTest.class)
 public class BlockingProcessStreamReaderJUnitTest extends ProcessStreamReaderTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessControllerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessControllerJUnitTest.java
index db5f823..331598b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessControllerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessControllerJUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for LocalProcessController.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class LocalProcessControllerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
index 0bbab35..8d037b2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherDUnitTest.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Multi-process tests for ProcessLauncher.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("serial")
 public class LocalProcessLauncherDUnitTest extends DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherJUnitTest.java
index 3ff9936..563109f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/LocalProcessLauncherJUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Unit tests for ProcessLauncher.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class LocalProcessLauncherJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReaderJUnitTest.java
index 2960190..a9ac85c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReaderJUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * 
  * None of the tests should be skipped or hang on Windows.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 @Category(IntegrationTest.class)
 public class NonBlockingProcessStreamReaderJUnitTest extends ProcessStreamReaderTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java
index bd9bf62..40a7dab 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/PidFileJUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.test.junit.rules.ExpectedTimeoutRule;
 /**
  * Unit tests the PidFile class.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 @Category(IntegrationTest.class)
 public class PidFileJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/ProcessControllerFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/ProcessControllerFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/ProcessControllerFactoryJUnitTest.java
index a676f8e..22fa4e0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/ProcessControllerFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/ProcessControllerFactoryJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 
 /**
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(UnitTest.class)
 public class ProcessControllerFactoryJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
index 488957d..1c05cc4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandlerJUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class AbstractSignalNotificationHandlerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
index c24bc22..a1ea030 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/DummyStatistics.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.StatisticsType;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DummyStatistics implements Statistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/SampleCollectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/SampleCollectorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/SampleCollectorJUnitTest.java
index 37b75a4..1babbc1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/SampleCollectorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/SampleCollectorJUnitTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for the SampleCollector class. No disk IO.
  *   
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class SampleCollectorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandlerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandlerJUnitTest.java
index c4370e5..bcb7497 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandlerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandlerJUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for the StatMonitorHandler and its inner classes.
  *   
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class StatMonitorHandlerJUnitTest {
@@ -203,7 +203,7 @@ public class StatMonitorHandlerJUnitTest {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   private static class TestStatisticsMonitor extends StatisticsMonitor {
     private volatile long timeStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 2a9c3c7..830a73f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -79,7 +79,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * This test mimics hydratest/locators/cacheDS.conf in an attempt to reproduce
  * bug #45478. So far this test passes consistently.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("serial")
 public class StatisticsDUnitTest extends CacheTestCase {
@@ -606,7 +606,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class PubSubStats {
     
@@ -723,7 +723,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class UpdateListener extends CacheListenerAdapter<String, Number> {
     
@@ -740,7 +740,7 @@ public class StatisticsDUnitTest extends CacheTestCase {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class RegionMembershipListener extends RegionMembershipListenerAdapter<String, Number> {
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitorJUnitTest.java
index 4ee8995..b995451 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitorJUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for the StatisticsMonitor class. No disk IO.
  *   
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class StatisticsMonitorJUnitTest {
@@ -165,7 +165,7 @@ public class StatisticsMonitorJUnitTest {
   // TODO: test notifyListeners
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class TestStatisticsMonitor extends StatisticsMonitor {
     private volatile long timeStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestSampleHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestSampleHandler.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestSampleHandler.java
index 699c7d3..2a6506b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestSampleHandler.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestSampleHandler.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TestSampleHandler implements SampleHandler {
 
@@ -73,7 +73,7 @@ public class TestSampleHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class Info {
     private final String name;
@@ -100,7 +100,7 @@ public class TestSampleHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class ResourceInstanceInfo extends Info {
     private final ResourceInstance resource;
@@ -121,7 +121,7 @@ public class TestSampleHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class ResourceTypeInfo extends Info {
     private final ResourceType type;
@@ -142,7 +142,7 @@ public class TestSampleHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class SampledInfo extends Info {
     private final long timeStamp;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatArchiveWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatArchiveWriter.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatArchiveWriter.java
index 5ba999e..81d963e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatArchiveWriter.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatArchiveWriter.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.NanoTimer;
 import com.gemstone.gemfire.internal.StatArchiveWriter;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TestStatArchiveWriter extends StatArchiveWriter {
   public static final long WRITER_PREVIOUS_TIMESTAMP_NANOS = 432662613L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsManager.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsManager.java
index a8620b7..fbb3dce 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsManager.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.OsStatisticsFactory;
 import com.gemstone.gemfire.internal.StatisticsManager;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TestStatisticsManager extends AbstractStatisticsFactory 
     implements StatisticsManager, OsStatisticsFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsSampler.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsSampler.java
index d5ccbf5..0905167 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsSampler.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/TestStatisticsSampler.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.internal.StatisticsManager;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TestStatisticsSampler implements StatisticsSampler {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/ValueMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/ValueMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/ValueMonitorJUnitTest.java
index 52a5dfd..b13f72f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/ValueMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/ValueMonitorJUnitTest.java
@@ -48,7 +48,7 @@ import junit.framework.TestCase;
 /**
  * Integration test for the SampleCollector class.
  *   
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class ValueMonitorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
index 1fd759a..7927b09 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/ArrayUtilsJUnitTest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link ArrayUtils}.
  *
- * @since 7.x
+ * @since GemFire 7.x
  */
 @Category(UnitTest.class)
 public class ArrayUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/BlobHelperWithThreadContextClassLoaderTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
index 6dfcadd..ab50a81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/BlobHelperWithThreadContextClassLoaderTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Unit tests for {@link BlobHelper} with Thread Context ClassLoader.
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 @Category(UnitTest.class)
 public class BlobHelperWithThreadContextClassLoaderTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/util/CollectionUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/CollectionUtilsJUnitTest.java
index 242d2f2..2c01149 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/CollectionUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/CollectionUtilsJUnitTest.java
@@ -48,7 +48,7 @@ import org.junit.experimental.categories.Category;
  * @see com.gemstone.gemfire.internal.util.CollectionUtils
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class CollectionUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/internal/util/Valuable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/Valuable.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/Valuable.java
index 885b665..6e2a6c3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/Valuable.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/Valuable.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.util;
  * value associated with them.  This interface is not considered to be
  * a "user class".
  *
- * @since 2.0.3
+ * @since GemFire 2.0.3
  */
 public interface Valuable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
index 7e6ce46..8b70d5c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.pdx.internal.PdxInstanceFactoryImpl;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
- * @since 8.1
+ * @since GemFire 8.1
  *
  */
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index c96c1c8..6516547 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -61,7 +61,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 /**
  * Tests the UniversalMembershipListenerAdapter.
  *
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTestCase {
   protected static final boolean CLIENT = true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
index da1f918..87be3e9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * 
- * @since  1.4
+ * @since GemFire  1.4
  */
 @Category(IntegrationTest.class)
 public class DistributedSystemStatsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 93d2683..588c22d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.NanoTimer;
 /**
  * Base test case for the management.bean.stats tests.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class MBeanStatsTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
index f026a52..69d99d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CommandManagerJUnitTest.java
@@ -220,7 +220,7 @@ public class CommandManagerJUnitTest {
   
   /**
    * Tests {@link CommandManager#loadPluginCommands()}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testCommandManagerLoadPluginCommands() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
index a865699..8d5d51f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.lib.legacy.ClassImposteriser
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class AbstractCommandsSupportJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 1d861c6..217b716 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 /**
  * Dunit class for testing GemFire config commands : export config
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(DistributedTest.class)
 @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 7d1a7ff..c070ce9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 /**
  * Unit tests for the DeployCommands class
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("serial")
 @Category(DistributedTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 2502a4b..8681713 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -79,7 +79,7 @@ import org.junit.runners.Parameterized;
  * @see com.gemstone.gemfire.management.internal.cli.commands.DiskStoreCommands
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(DistributedTest.class)
 @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index 0a82283..490230d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.lib.legacy.ClassImposteriser
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class DiskStoreCommandsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index 2182301..0194132 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -59,7 +59,7 @@ import org.junit.experimental.categories.Category;
  *
  * @see com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase
  * @see com.gemstone.gemfire.management.internal.cli.commands.DataCommands
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings("unused")
 @Category(DistributedTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 38849c7..b27e76e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.gemstone.gemfire.util.test.TestUtil;
 
 /**
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(IntegrationTest.class)
 public class HTTPServiceSSLSupportJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsJUnitTest.java
index a51a83a..ac49371 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsJUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.lib.legacy.ClassImposteriser
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class IndexCommandsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index a61c717..02a5554 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category;
  *
  * @see com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase
  * @see com.gemstone.gemfire.management.internal.cli.commands.DiskStoreCommands
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(DistributedTest.class)
 public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 5753b16..313f782 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
  *
  * @see com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase
  * @see com.gemstone.gemfire.management.internal.cli.commands.IndexCommands
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 @Category(DistributedTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 4472193..ef26a59 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -53,7 +53,7 @@ import org.junit.experimental.categories.Category;
 /**
  * A distributed test suite of test cases for testing the queue commands that are part of Gfsh.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(DistributedTest.class)
 public class QueueCommandsDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index a234edb..d02dff5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -40,7 +40,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Unit tests for configuring user commands.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 @Category(DistributedTest.class)
 public class UserCommandsDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index 1d41279..ced755d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -69,7 +69,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings({ "null", "unused" })
 @Category(UnitTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
index ff34701..30ac03a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunctionJUnitTest.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.Mockery
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class ListDiskStoresFunctionJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
index ff7a7ad..a9123ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunctionJUnitTest.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see org.jmock.lib.legacy.ClassImposteriser
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class ListIndexFunctionJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
index d4d0d8e..49588fc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/domain/CacheElementJUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * Test cases for {@link CacheElement}.
  *
  * @see CacheElement
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class CacheElementJUnitTest {
@@ -60,7 +60,7 @@ public class CacheElementJUnitTest {
    * Asserts that Cache type is defined as a embedded ComplexType under an
    * Element named "cache" for version 8.1.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testCacheDefinedAsNestedComplexType8_1() throws Exception {
@@ -76,7 +76,7 @@ public class CacheElementJUnitTest {
    * means that cache type is defined as a named ComplexType or reference.
    * Update code in CacheElement.buildElementMapCacheType to account for this.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testCacheDefinedAsNestedComplexTypeLatest() throws Exception {
@@ -93,7 +93,7 @@ public class CacheElementJUnitTest {
    * correct order. If we change to use choice for all elements then we can
    * abandon this mapping.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testBuildElementMap() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index ff4980d..340c637 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * new config and applying it to the current shared config.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(IntegrationTest.class)
 public class XmlUtilsAddNewNodeJUnitTest {
@@ -92,7 +92,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * 
    * @throws Exception
    * @throws XPathExpressionException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeNewNamed() throws Exception {
@@ -145,7 +145,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>region</code> elements.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeNewUnnamed() throws Exception {
@@ -182,7 +182,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * element.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeNewUnnamedExtension() throws Exception {
@@ -222,7 +222,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * with same <code>name</code>.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeReplaceNamed() throws Exception {
@@ -257,7 +257,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>pdx</code>. It should replace <code>pdx</code> element.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeReplaceUnnamed() throws Exception {
@@ -293,7 +293,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>test:cache</code> element.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testAddNewNodeReplaceUnnamedExtension() throws Exception {
@@ -329,7 +329,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * with same <code>name</code>.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testDeleteNodeNamed() throws Exception {
@@ -358,7 +358,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>pdx</code>. It should remove the existing <code>pdx</code> element.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testDeleteNodeUnnamed() throws Exception {
@@ -388,7 +388,7 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>test:cache</code> element.
    * 
    * @throws Exception
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Test
   public void testDeleteNodeUnnamedExtension() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index f0d8c83..3d9b12f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * Unit tests for {@link XmlUtils}. See Also {@link XmlUtilsAddNewNodeJUnitTest}
  * for tests related to {@link XmlUtils#addNewNode(Document, XmlEntity)}
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 @Category(UnitTest.class)
 public class XmlUtilsJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
index 5d6eeac..d98d962 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationDUnitTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  * invalid credentials/modules. It also checks for authentication
  * success/failure in case of failover and for the notification channel.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ClientAuthenticationDUnitTest extends ClientAuthenticationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
index 43e4b1a..79feae9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
  * pre-operation callbacks. It also checks for authorization in case of
  * failover.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class ClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index f9e45b3..22c4cb2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@ -72,7 +72,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
  * Base class for tests for authorization from client to server. It contains
  * utility functions for the authorization tests from client to server.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestCase {
 
@@ -884,7 +884,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
    * different operations and also queues up the received updates to precise
    * checking of each update.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   private static class AuthzCqListener implements CqListener {
 
@@ -972,7 +972,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
    * This class specifies flags that can be used to alter the behaviour of
    * operations being performed by the <code>doOp</code> function.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected static class OpFlags {
 
@@ -1129,7 +1129,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
    * This class encapsulates an {@link OperationCode} with associated flags, the
    * client to perform the operation, and the number of operations to perform.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected static class OperationWithAction {
 
@@ -1274,7 +1274,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
    * indices also. This is utilized by the post-operation authorization tests
    * where authorization is based on key indices.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected interface TestCredentialGenerator {
 
@@ -1300,7 +1300,7 @@ public abstract class ClientAuthorizationTestCase extends JUnit4DistributedTestC
    * Contains a {@link AuthzCredentialGenerator} and implements the
    * {@link TestCredentialGenerator} interface.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected static class TestAuthzCredentialGenerator implements TestCredentialGenerator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
index 3e399b7..0efd3d6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientAuthorizationDUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.SecurityTest;
 
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public final class DeltaClientAuthorizationDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
index 0fcb3cb..fd572ba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.SecurityTest;
 
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class DeltaClientPostAuthorizationDUnitTest extends ClientAuthorizationTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index 31184aa..6970ef2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.SecurityTest;
 /**
  * Tests peer to peer authentication in Gemfire
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 @Category({ DistributedTest.class, SecurityTest.class })
 public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
index 10ac68a..e992dd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
@@ -94,7 +94,7 @@ import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
  * Contains utility methods for setting up servers/clients for authentication
  * and authorization tests.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public final class SecurityTestUtils {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index 712244b..b8cd2f5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -60,7 +60,7 @@ import java.util.concurrent.*;
  * notifies them when updates occur.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 @SuppressWarnings({"synthetic-access", "deprecation"})
 public class CacheClientNotifier {
@@ -682,7 +682,7 @@ public class CacheClientNotifier {
    *
    * @param membershipID
    *          Uniquely identifies the client pool
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setKeepAlive(ClientProxyMembershipID membershipID, boolean keepAlive)
   {
@@ -1323,7 +1323,7 @@ public class CacheClientNotifier {
    * @param regionsWithEmptyDataPolicy
    * @param regionName
    * @param regionDataPolicy (0==empty)
-   * @since 6.1
+   * @since GemFire 6.1
    */
   public void updateMapOfEmptyRegions(Map regionsWithEmptyDataPolicy,
       String regionName, int regionDataPolicy) {
@@ -1430,7 +1430,7 @@ public class CacheClientNotifier {
    * haContainer.
    * 
    * @param conflatable
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void checkAndRemoveFromClientMsgsRegion(Conflatable conflatable) {
     if (haContainer == null) {
@@ -1734,7 +1734,7 @@ public class CacheClientNotifier {
    *                id for the durable-client
    * @return - true if a proxy is present for the given durable client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean hasDurableClient(String durableId)
   {
@@ -1755,7 +1755,7 @@ public class CacheClientNotifier {
    *                id for the durable-client
    * @return - true if a primary proxy is present for the given durable client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean hasPrimaryForDurableClient(String durableId)
   {
@@ -1954,7 +1954,7 @@ public class CacheClientNotifier {
    * @param listener
    *                The <code>InterestRegistrationListener</code> to register
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void registerInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -1969,7 +1969,7 @@ public class CacheClientNotifier {
    *                The <code>InterestRegistrationListener</code> to
    *                unregister
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public void unregisterInterestRegistrationListener(
       InterestRegistrationListener listener) {
@@ -1983,7 +1983,7 @@ public class CacheClientNotifier {
    * @return a read-only collection of <code>InterestRegistrationListener</code>s
    *         registered with this notifier
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public Set getInterestRegistrationListeners() {
     return this.readableInterestRegistrationListeners;
@@ -1991,7 +1991,7 @@ public class CacheClientNotifier {
 
   /**
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   protected boolean containsInterestRegistrationListeners() {
     return !this.writableInterestRegistrationListeners.isEmpty();
@@ -1999,7 +1999,7 @@ public class CacheClientNotifier {
 
   /**
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   protected void notifyInterestRegistrationListeners(
       InterestRegistrationEvent event) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifierStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifierStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifierStats.java
index b51ae5c..afc4235 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifierStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifierStats.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionStats;
  * are related to cache server client notifications.
  *
  *
- * @since 4.1.2
+ * @since GemFire 4.1.2
  */
 public class CacheClientNotifierStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
index 63c05ca..d9a71d5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
@@ -113,7 +113,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * client.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 @SuppressWarnings("synthetic-access")
 public class CacheClientProxy implements ClientSession {
@@ -250,7 +250,7 @@ public class CacheClientProxy implements ClientSession {
 
   private boolean isPrimary;
   
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   protected byte clientConflation = HandShake.CONFLATION_DEFAULT;
   
   /**
@@ -278,7 +278,7 @@ public class CacheClientProxy implements ClientSession {
    * event's region name is present in this map, it's full value (and not 
    * delta) is sent to the client represented by this proxy.
    *
-   * @since 6.1
+   * @since GemFire 6.1
    */
   private volatile Map regionsWithEmptyDataPolicy = new HashMap();
 
@@ -793,7 +793,7 @@ public class CacheClientProxy implements ClientSession {
    *
    * @return whether the proxy is paused
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public boolean isPaused() {
     return this._isPaused;
@@ -3088,7 +3088,7 @@ public class CacheClientProxy implements ClientSession {
   /**
    * Get map of regions with empty data policy
    *
-   * @since 6.1
+   * @since GemFire 6.1
    */
   public Map getRegionsWithEmptyDataPolicy() {
     return regionsWithEmptyDataPolicy;
@@ -3107,7 +3107,7 @@ public class CacheClientProxy implements ClientSession {
    * Returns the number of seconds that have elapsed since the Client proxy
    * created.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public long getUpTime() {
     return (long) ((System.currentTimeMillis() - this.creationDate.getTime()) / 1000);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxyStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxyStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxyStats.java
index dddcf1d..cf69d90 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxyStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxyStats.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionStats;
  * client notifications for each client.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 public class CacheClientProxyStats implements MessageStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
index ce067d7..6e45d1d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -102,7 +102,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * {@linkplain com.gemstone.gemfire.cache.Region#localInvalidate(Object) invalidates}
  * the local cache based on the contents of those messages.
  * 
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class CacheClientUpdater extends Thread implements ClientUpdater,
     DisconnectListener {
@@ -1698,7 +1698,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
           
           // extract the eventId and verify if it is a duplicate event
           // if it is a duplicate event, ignore
-          // @since 5.1
+          // @since GemFire 5.1
           int numberOfParts = _message.getNumberOfParts();
           eid = _message.getPart(numberOfParts - 1);
           // TODO the message handling methods also deserialized the eventID - inefficient
@@ -1926,7 +1926,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
   /**
    * Stats for a CacheClientUpdater. Currently the only thing measured
    * are incoming bytes on the wire
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static class CCUStats implements MessageStats {
     // static fields 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerHelper.java
index 4e6d16a..dde8865 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerHelper.java
@@ -39,7 +39,7 @@ import java.util.zip.GZIPOutputStream;
  * <code>CacheServerHelper</code> is a static class that provides helper methods
  * for the CacheServer classes.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class CacheServerHelper {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ChunkedMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ChunkedMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ChunkedMessage.java
index 2c49f90..dbea4c5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ChunkedMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ChunkedMessage.java
@@ -59,7 +59,7 @@ import org.apache.logging.log4j.Logger;
  * @see com.gemstone.gemfire.internal.cache.tier.MessageType
  * 
  * 
- * @since 4.2
+ * @since GemFire 4.2
  */
 public class ChunkedMessage extends Message
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientBlacklistProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientBlacklistProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientBlacklistProcessor.java
index c7fb7c4..11ce992 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientBlacklistProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientBlacklistProcessor.java
@@ -39,7 +39,7 @@ import java.util.Set;
  * A processor for sending client black list message to all nodes from primary.
  * This adds client to the blacklist and destroy it's queue if available on node.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  *
  */
 public class ClientBlacklistProcessor extends ReplyProcessor21 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitor.java
index c0f5021..ed38bd6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * dead and interrupts its threads.
  * 
  * 
- * @since 4.2.3
+ * @since GemFire 4.2.3
  */
 public class ClientHealthMonitor {
   private static final Logger logger = LogService.getLogger();
@@ -786,7 +786,7 @@ public class ClientHealthMonitor {
   /**
    * Returns a brief description of this <code>ClientHealthMonitor</code>
    *
-   * @since 5.1
+   * @since GemFire 5.1
    */
   @Override
   public String toString()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInstantiatorMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index 288c3f8..bd37c4e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
  * instantiators along with the unique <code>EventID</code>
  * 
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
   private static final long serialVersionUID = 2949326125521840437L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestMessageImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestMessageImpl.java
index 4e86478..c7fd61a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestMessageImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestMessageImpl.java
@@ -32,7 +32,7 @@ import java.io.*;
  * client.
  *
  *
- * @since 5.6
+ * @since GemFire 5.6
  */
 public class ClientInterestMessageImpl implements ClientMessage {
 
@@ -62,7 +62,7 @@ public class ClientInterestMessageImpl implements ClientMessage {
   /**
    * Whether the create or update events for this <code>ClientMessage</code>
    * is sent as an invalidate
-   * @since 6.0.3
+   * @since GemFire 6.0.3
    */
   private boolean forUpdatesAsInvalidates;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMarkerMessageImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
index 97f53c2..ab616dc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMarkerMessageImpl.java
@@ -31,7 +31,7 @@ import java.io.*;
  * to be used mostly by the durable clients, although all clients receive it.
  *
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public final class ClientMarkerMessageImpl implements ClientMessage {
   private static final long serialVersionUID = 5423895238521508743L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMessage.java
index c34e539..c435b3d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientMessage.java
@@ -27,7 +27,7 @@ import java.io.IOException;
  * operation that is sent from a server to an interested client. 
  *
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface ClientMessage extends Conflatable, DataSerializableFixedID {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientPingMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientPingMessageImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientPingMessageImpl.java
index b83bd30..4f46a0a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientPingMessageImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientPingMessageImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
  * the client connection is still alive.
  * 
  * 
- * @since 6.6.2.x
+ * @since GemFire 6.6.2.x
  */
 public final class ClientPingMessageImpl implements ClientMessage {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
index 5610110..61ea62a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -421,7 +421,7 @@ public final class ClientProxyMembershipID
    * Returns whether this <code>ClientProxyMembershipID</code> is durable.
    * @return whether this <code>ClientProxyMembershipID</code> is durable
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public boolean isDurable() {
     String durableClientId = getDistributedMember().getDurableClientAttributes().getId(); 
@@ -432,7 +432,7 @@ public final class ClientProxyMembershipID
    * Returns this <code>ClientProxyMembershipID</code>'s durable attributes.
    * @return this <code>ClientProxyMembershipID</code>'s durable attributes
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected DurableClientAttributes getDurableAttributes() {
     return getDistributedMember().getDurableClientAttributes();
@@ -442,7 +442,7 @@ public final class ClientProxyMembershipID
    * Returns this <code>ClientProxyMembershipID</code>'s durable id.
    * @return this <code>ClientProxyMembershipID</code>'s durable id
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public String getDurableId() {
     DurableClientAttributes dca = getDurableAttributes();
@@ -453,7 +453,7 @@ public final class ClientProxyMembershipID
    * Returns this <code>ClientProxyMembershipID</code>'s durable timeout.
    * @return this <code>ClientProxyMembershipID</code>'s durable timeout
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected int getDurableTimeout() {
     DurableClientAttributes dca = getDurableAttributes();
@@ -509,7 +509,7 @@ public final class ClientProxyMembershipID
    * @return the name of the <code>HARegion</code> queueing this proxy's
    * messages.
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   protected String getHARegionName() {
     return getBaseRegionName() + "_queue";
@@ -522,7 +522,7 @@ public final class ClientProxyMembershipID
    * @return the name of the region used for communicating interest changes
    * between servers
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   protected String getInterestRegionName() {
     return getBaseRegionName() + "_interest";
@@ -548,7 +548,7 @@ public final class ClientProxyMembershipID
    * stops/starts its cache. When it restarts its cache, it needs to maintain
    * the same unique id
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static synchronized void resetUniqueIdCounter() {
     synch_counter = 0;
@@ -565,7 +565,7 @@ public final class ClientProxyMembershipID
    * <p>
    * This class is used to clean up resources associated with a particular
    * client and thus does not want to limit itself to the durable id.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public class Identity {
     public int getUniqueId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessage.java
index 46ddf0a..5bd5d1b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessage.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
  * operation that is sent from a server to an interested client.
  *
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface ClientUpdateMessage extends ClientMessage {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
index 1f715b0..0fb915e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientUpdateMessageImpl.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl;
  * operation that is sent from a server to an interested client.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, NewValueImporter
 {
@@ -148,7 +148,7 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
   /**
    * Represents the changed bytes of this event's _value.
    * 
-   * @since 6.1
+   * @since GemFire 6.1
    */
   private byte[] deltaBytes = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
index 26ed47b..db475d9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CommandInitializer.java
@@ -105,7 +105,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.command.UpdateClientNoti
 /**
  * A <code>CommandInitializer</code> maintains version specific commands map.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 
 public class CommandInitializer {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListener.java
index e79c579..35bb38a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListener.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
  * A listener which can be registered on {@link AcceptorImpl} 
  * in order to receive events about connections created
  * or destroyed for this acceptor.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface ConnectionListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListenerAdapter.java
index 8c784e1..6264fc9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionListenerAdapter.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
 
 /**
  * A ConnectionListener that does nothing.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class ConnectionListenerAdapter implements ConnectionListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAEventWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAEventWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAEventWrapper.java
index d60313d..5b08f51 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAEventWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAEventWrapper.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * <code>HARegionQueue</code> mechanics. It also has a property to indicate
  * the number of <code>HARegionQueue</code>s referencing this instance.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Sizeable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
index 909b133..3e07cfe 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
@@ -212,30 +212,30 @@ public class HandShake implements ClientHandShake
 
   public static final String PRIVATE_KEY_PASSWD_PROP = "security-server-kspasswd";
 
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final byte CONFLATION_DEFAULT = 0;
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final byte CONFLATION_ON = 1;
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   public static final byte CONFLATION_OFF = 2;
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   private byte clientConflation = CONFLATION_DEFAULT;
 
-  /** @since 6.0.3
+  /** @since GemFire 6.0.3
    *  List of per client property override bits.
    */
   private byte[] overrides = null;
   
   /**
    * Test hooks for per client conflation
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static byte clientConflationForTesting = 0;
   public static boolean setClientConflationForTesting = false;
 
   /**
    * Test hook for client version support
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private static Version currentClientVersion = ConnectionProxy.VERSION;
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyImpl.java
index bd51e0d..7ac84c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyImpl.java
@@ -28,7 +28,7 @@ import java.io.*;
  * Used to make InterestResultPolicy implement DataSerializableFixedID
  *
  *
- * @since 5.7 
+ * @since GemFire 5.7
  */
 public final class InterestResultPolicyImpl extends InterestResultPolicy
   implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
index a011875..aef2935 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Message.java
@@ -1038,7 +1038,7 @@ public class Message  {
   }
   /**
    * Undo any state changes done by setComms.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void unsetComms() {
     this.socket = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageStats.java
index 71a34d5..10b2ad8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/MessageStats.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache.tier.sockets;
 
 /**
  * Statistics supported by cache/server Message.
- * @since 5.0.2
+ * @since GemFire 5.0.2
  */
 public interface MessageStats {
   public void incReceivedBytes(long v);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartList.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartList.java
index b746f5f..d818e32 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ObjectPartList.java
@@ -40,7 +40,7 @@ import org.apache.logging.log4j.Logger;
  * exceptions. It can optionally also hold the list of associated keys. Assumes
  * that keys are either provided for all entries or for none.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ObjectPartList implements DataSerializableFixedID, Releasable {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
index bf90fab..5e52f96 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/Part.java
@@ -32,7 +32,7 @@ import java.nio.channels.*;
  *
  * @see Message
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class Part {
   private static final byte BYTE_CODE = 0;
@@ -41,7 +41,7 @@ public class Part {
   private Version version;
   /**
    * Used to represent and empty byte array for bug 36279
-   * @since 5.1
+   * @since GemFire 5.1
    */
   private static final byte EMPTY_BYTEARRAY_CODE = 2;
   private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
@@ -188,7 +188,7 @@ public class Part {
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void encodeInt(int v, byte[] bytes) {
     encodeInt(v, bytes, 0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
index dd6edf1..917ca33 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Distribution message for dropping client from blacklist.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  *
  */
 public class RemoveClientFromBlacklistMessage extends PooledDistributionMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index 56aba4d..e8afdb2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -72,7 +72,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * cache connection. Each server connection runs in its own thread to maximize
  * concurrency and improve response times to edge requests
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class ServerConnection implements Runnable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 867f397..ea90e6e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -50,7 +50,7 @@ import java.util.Properties;
 /**
  * A <code>ServerHandShakeProcessor</code> verifies the client's version compatibility with server.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 
 
@@ -66,7 +66,7 @@ public class ServerHandShakeProcessor {
   /**
    * Test hook for server version support
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void setSeverVersionForTesting(short ver) {
     currentServerVersion = Version.fromOrdinalOrCurrent(ver);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerQueueStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerQueueStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerQueueStatus.java
index c260c03..02a0acd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerQueueStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerQueueStatus.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * response of Handshake to server. This wrapper object is used to hold the
  * various info retrurned from Handshake. such as endpoint type and queue size.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  * 
  */
 public class ServerQueueStatus

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerResponseMatrix.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerResponseMatrix.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerResponseMatrix.java
index c518602..8c40695 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerResponseMatrix.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerResponseMatrix.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
  * entries are gathered up after the RI response is completed and removed from
  * the system
  * 
- * @since 5.1
+ * @since GemFire 5.1
  * 
  */
 public class ServerResponseMatrix

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList.java
index 7f6bef4..53125f2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/VersionedObjectList.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * This class also implements Externalizable so that it can be serialized as
  * part of a PutAllPartialResultException.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 public class VersionedObjectList extends ObjectPartList implements Externalizable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommand.java
index 79c73fc..71b0b21 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommand.java
@@ -40,7 +40,7 @@ import java.io.IOException;
  * This is the base command which read the parts for the
  * MessageType.COMMIT.<br>
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CommitCommand extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction.java
index 045eccd..8ceb001 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
  * If the hasResult byte is 1, then this command send back the result after the
  * execution to the client else do not send the reply back to the client
  * 
- * @since 5.8Beta
+ * @since GemFire 5.8Beta
  */
 public class ExecuteFunction extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction65.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction65.java
index 0bda7ff..d2869d1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction65.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction65.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 /**
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ExecuteFunction65 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
index 296c029..3a20bc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteFunction66.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 /**
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class ExecuteFunction66 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
index 5a38567..40f0ee5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
  * If the hasResult byte is 1, then this command send back the result after the
  * execution to the client else do not send the reply back to the client
  * 
- * @since 5.8LA
+ * @since GemFire 5.8LA
  */
 public class ExecuteRegionFunction extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
index c54a65e..f92a366 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction61.java
@@ -52,7 +52,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 /**
  * 
  * 
- *  @since 6.1
+ *  @since GemFire 6.1
  */
 public class ExecuteRegionFunction61 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
index 9c92e98..001b912 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction65.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 /**
  * 
- *  @since 6.5
+ *  @since GemFire 6.5
  */
 public class ExecuteRegionFunction65 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
index 5d1443d..6e42316 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunction66.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 /**
  * 
- *  @since 6.6
+ *  @since GemFire 6.6
  */
 public class ExecuteRegionFunction66 extends BaseCommand {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
index 8dcc155..f5d8e51 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteRegionFunctionSingleHop.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 
 /**
  * 
- *  @since 6.5
+ *  @since GemFire 6.5
  */
 public class ExecuteRegionFunctionSingleHop extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
index c926072..7e4d0b9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * {@link Command} for {@link GetClientPRMetadataCommand}
  * 
  * 
- * @since 6.5 
+ * @since GemFire 6.5
  */
 public class GetClientPRMetadataCommand extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
index 45fe376..e3d18b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPRMetadataCommand66.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * {@link Command} for {@link GetClientPRMetadataCommand66}
  * 
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GetClientPRMetadataCommand66 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
index 351c24f..204391d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * {@link Command} for {@link GetClientPartitionAttributesOp} operation 
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public class GetClientPartitionAttributesCommand extends BaseCommand {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
index d9aeda0..3eca123 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * {@link Command} for {@link GetClientPartitionAttributesOp} operation for 6.6
  * clients
  * 
- * @since 6.6
+ * @since GemFire 6.6
  * 
  */
 public class GetClientPartitionAttributesCommand66 extends BaseCommand {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntry70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntry70.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntry70.java
index 3a9c532..d975f1b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntry70.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntry70.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionTag;
  * getEntry(key) operation performed on server.
  * Extends Request, and overrides getValueAndIsObject() in Request
  * so as to not invoke loader.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GetEntry70 extends Get70 {
 
@@ -42,12 +42,12 @@ public class GetEntry70 extends Get70 {
   protected GetEntry70() {
   }
   
-  @Override
-  protected Get70.Entry getEntry(Region region, Object key,
-      Object callbackArg, ServerConnection servConn) {
-    return getValueAndIsObject(region, key, callbackArg, servConn);
-  }
-
+  @Override
+  protected Get70.Entry getEntry(Region region, Object key,
+      Object callbackArg, ServerConnection servConn) {
+    return getValueAndIsObject(region, key, callbackArg, servConn);
+  }
+
   @Override
   public Get70.Entry getValueAndIsObject(Region region, Object key,
       Object callbackArg, ServerConnection servConn) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntryCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntryCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntryCommand.java
index f5226e9..b8075d1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntryCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetEntryCommand.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
  * getEntry(key) operation performed on server.
  * Extends Request, and overrides getValueAndIsObject() in Request
  * so as to not invoke loader.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GetEntryCommand extends Request {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ManagementCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ManagementCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ManagementCommand.java
index cdf4399..2322429 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ManagementCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ManagementCommand.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
 /**
  * TODO: Javadoc everything and edit as needed
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ManagementCommand extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put61.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put61.java
index 941f711..4cadd20 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put61.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.security.AuthorizeRequest;
 import com.gemstone.gemfire.security.GemFireSecurityException;
 
 /**
- * @since 6.1 
+ * @since GemFire 6.1
  */
 public class Put61 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put65.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put65.java
index 40a68ee..4ccc03a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put65.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/Put65.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.internal.util.Breadcrumbs;
 import com.gemstone.gemfire.security.GemFireSecurityException;
 
 /**
- * @since 6.5 
+ * @since GemFire 6.5
  */
 public class Put65 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
index 6100b52..5b4109c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterest61.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.i18n.StringId;
 
 import java.io.IOException;
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class RegisterInterest61 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
index 92c03f6..102e168 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList61.java
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class RegisterInterestList61 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
index 58051a1..862e58b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RegisterInterestList66.java
@@ -45,7 +45,7 @@ import java.util.List;
  * as a separate part.
  * 
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class RegisterInterestList66 extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
index bdeba72..ac546fc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RemoveAll.java
@@ -16,7 +16,7 @@
  */
 /**
  * Author: dschneider
- * @since 8.1
+ * @since GemFire 8.1
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
index 3c72118..5eabef0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/RequestEventValue.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Represents a request for (full) value of a given event from ha container
  * (client-messages-region).
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class RequestEventValue extends BaseCommand {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/ConcurrentCacheModificationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/ConcurrentCacheModificationException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/ConcurrentCacheModificationException.java
index af297d1..f7b21ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/ConcurrentCacheModificationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/versions/ConcurrentCacheModificationException.java
@@ -26,7 +26,7 @@ import java.util.ConcurrentModificationException;
  * mechanism when a conflict is detected.  It is not currently meant to be
  * exposed to customers.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ConcurrentCacheModificationException extends
     ConcurrentModificationException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
index 713023f..0704bb8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySender.java
@@ -84,7 +84,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * common functionality like initializing proxy.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 
 public abstract class AbstractGatewaySender implements GatewaySender,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 2ef5e19..3c70a4b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -67,7 +67,7 @@ import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration;
  *  {@link ConcurrentParallelGatewaySenderQueue}.
  * The dispatcher could be either GatewaySenderEventRemoteDispatcher or GatewaySenderEventCallbackDispatcher.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public abstract class AbstractGatewaySenderEventProcessor extends Thread {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/BatchException70.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/BatchException70.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/BatchException70.java
index 5183e45..adb59d3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/BatchException70.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/BatchException70.java
@@ -25,7 +25,7 @@ import java.util.List;
  * An exception thrown during batch processing.
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 // Note that since this class is inside of an internal package,
 // we make it extend Exception, thereby making it a checked exception.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException.java
index a01b12c..727b6a1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.OperationAbortedException;
 /**
  * Exception observed during GatewayReceiver operations.
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class GatewayReceiverException extends OperationAbortedException {
   private static final long serialVersionUID = 7079321411869820364L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException.java
index 07a6651..e55b114 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderConfigurationException.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.cache.wan;
  * An exception indicating that a gateway configuration will not work with the
  * remote side of the gateway's configuration.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class GatewaySenderConfigurationException extends GatewaySenderException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
index f6f8d88..f84dbbb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackArgument.java
@@ -42,7 +42,7 @@ import java.util.Set;
  * <p>
  * This class used to be in package <code>com.gemstone.gemfire.util</code>.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class GatewaySenderEventCallbackArgument extends
 WrappedCallbackArgument implements DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
index 549c22b..48eaaa0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * <code>GatewayEvent</code>s to <code>AsyncEventListener</code>
  * callback implementers. This dispatcher is used in the write-behind case.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventDispatcher{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventDispatcher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventDispatcher.java
index 57f180c..b2f5244 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventDispatcher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventDispatcher.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan;
 
 import java.util.List;
 /**
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public interface GatewaySenderEventDispatcher {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
index 09d68f5..8a811e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventImpl.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * <code>GatewaySender</code>
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class GatewaySenderEventImpl implements 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
index fda0fc5..476c2c1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * Removes a batch of events from the remote secondary queues
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class ParallelQueueBatchRemovalMessage  extends PartitionMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index 14d2f20..2b66227 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Removes a batch of events from the remote secondary queues  
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class ParallelQueueRemovalMessage extends PooledDistributionMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
index 3abd17b..ba839f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventProcessor.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class SerialGatewaySenderEventProcessor extends AbstractGatewaySenderEventProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 312fc4b..5c26bfe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -74,7 +74,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
 import com.gemstone.gemfire.pdx.internal.PeerTypeRegistration;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class SerialGatewaySenderQueue implements RegionQueue {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialSecondaryGatewayListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialSecondaryGatewayListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialSecondaryGatewayListener.java
index 8250270..3d5c469 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialSecondaryGatewayListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialSecondaryGatewayListener.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl;
 import com.gemstone.gemfire.internal.logging.LogService;
 /**
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class SerialSecondaryGatewayListener extends CacheListenerAdapter

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParser.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParser.java
index dddc192..c66b242 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/AbstractXmlParser.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
  * references for {@link #logWriter} and {@link #stack}
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 // UnitTest AbstractXmlParserTest
 public abstract class AbstractXmlParser implements XmlParser {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index bdde29e..3bc743f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -125,7 +125,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
  * public for testing purposes.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheCreation implements InternalCache {
 
@@ -207,7 +207,7 @@ public class CacheCreation implements InternalCache {
   
   /**
    * {@link ExtensionPoint} support.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private SimpleExtensionPoint<Cache> extensionPoint = new SimpleExtensionPoint<Cache>(this, this);
 
@@ -228,7 +228,7 @@ public class CacheCreation implements InternalCache {
   /**
    * @param forParsing if true then this creation is used for parsing xml;
    *   if false then it is used for generating xml.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheCreation(boolean forParsing) {
     initializeRegionShortcuts();
@@ -237,7 +237,7 @@ public class CacheCreation implements InternalCache {
     }
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void startingGenerate() {
     createInProgress.set(null);
@@ -344,7 +344,7 @@ public class CacheCreation implements InternalCache {
   /**
    * create diskstore factory
    * 
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public DiskStoreFactory createDiskStoreFactory() {
     return new DiskStoreFactoryImpl(this);
@@ -353,7 +353,7 @@ public class CacheCreation implements InternalCache {
   /**
    * Store the current CacheCreation that is doing a create.
    * Used from PoolManager to defer to CacheCreation as a manager of pools.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private static ThreadLocal createInProgress = new ThreadLocal();
 
@@ -361,7 +361,7 @@ public class CacheCreation implements InternalCache {
    * Returns null if the current thread is not doing a CacheCreation create.
    * Otherwise returns the PoolManagerImpl of the CacheCreation of the
    * create being invoked.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final PoolManagerImpl getCurrentPoolManager() {
     return (PoolManagerImpl)createInProgress.get();
@@ -948,25 +948,25 @@ public class CacheCreation implements InternalCache {
   }
     
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(RegionShortcut atts) {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory() {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(String regionAttributesId) {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> RegionFactory<K,V> createRegionFactory(RegionAttributes<K,V> regionAttributes) {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
@@ -1111,7 +1111,7 @@ public class CacheCreation implements InternalCache {
 
   /**
    * Implementation of {@link Cache#setCopyOnRead}
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setCopyOnRead(boolean copyOnRead) {
     this.copyOnRead = copyOnRead;
@@ -1120,7 +1120,7 @@ public class CacheCreation implements InternalCache {
 
   /**
    * Implementation of {@link Cache#getCopyOnRead}
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean getCopyOnRead() {
     return this.copyOnRead;
@@ -1133,7 +1133,7 @@ public class CacheCreation implements InternalCache {
   /**
    * Adds a CacheTransactionManagerCreation for this Cache (really just a
    * placeholder since a CacheTransactionManager is really a Cache singleton)
-   * @since 4.0
+   * @since GemFire 4.0
    * @see GemFireCacheImpl
    */
   public void
@@ -1163,7 +1163,7 @@ public class CacheCreation implements InternalCache {
   /**
    * Returns the DiskStore list
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public Collection<DiskStoreImpl> listDiskStores() {
     return this.diskStores.values();
@@ -1297,7 +1297,7 @@ public class CacheCreation implements InternalCache {
    * Returns whether PdxInstance is preferred for PDX types instead of Java object.
    * @see com.gemstone.gemfire.cache.CacheFactory#setPdxReadSerialized(boolean)
    *
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public boolean getPdxReadSerialized() {
      return cacheConfig.isPdxReadSerialized();
@@ -1389,7 +1389,7 @@ public class CacheCreation implements InternalCache {
 
   /**
    * @see Extensible#getExtensionPoint()
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Override
   public ExtensionPoint<Cache> getExtensionPoint() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java
index 14527ad..22d684f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheServerCreation.java
@@ -32,7 +32,7 @@ import java.util.Set;
 /**
  * Represents a {@link CacheServer} that is created declaratively.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CacheServerCreation extends AbstractCacheServer {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheTransactionManagerCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheTransactionManagerCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheTransactionManagerCreation.java
index cf37928..c8a4ab1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheTransactionManagerCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheTransactionManagerCreation.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Represents a {@link CacheTransactionManager} that is created declaratively.  
  *
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CacheTransactionManagerCreation implements CacheTransactionManager {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
index cc5ac59..8295487 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
@@ -227,7 +227,7 @@ public class LocalRegion extends AbstractRegion
   
   /**
    * Internal interface used to simulate failures when performing entry operations
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public interface TestCallable {
     public void call(LocalRegion r, Operation op, RegionEntry re);
@@ -331,7 +331,7 @@ public class LocalRegion extends AbstractRegion
    * Used by unit tests to set expiry to milliseconds instead of the default
    * seconds. Used in ExpiryTask.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   final boolean EXPIRY_UNITS_MS;
 
@@ -366,7 +366,7 @@ public class LocalRegion extends AbstractRegion
    * Used to hold off cache listener events until the afterRegionCreate is
    * called
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private final StoppableCountDownLatch afterRegionCreateEventLatch;
 
@@ -822,7 +822,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected final ServerRegionProxy srp;
 
@@ -897,7 +897,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Returns the member id of my distributed system
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   @Override
   protected InternalDistributedMember getMyId()
@@ -1600,7 +1600,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Returns true if get should give a copy; false if a reference.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected boolean isCopyOnRead()
   {
@@ -1615,7 +1615,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Makes a copy, if copy-on-get is enabled, of the specified object.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected Object conditionalCopy(Object o)
   {
@@ -2006,7 +2006,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Flavor of keys that will not do repeatable read
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public Set testHookKeys()
   {
@@ -2209,7 +2209,7 @@ public class LocalRegion extends AbstractRegion
    *
    * @return <code>null</code> if disk regions are not being used
    *
-   * @since 3.2
+   * @since GemFire 3.2
    */
   public DiskRegion getDiskRegion()
   {
@@ -2233,7 +2233,7 @@ public class LocalRegion extends AbstractRegion
    *
    * Initially called by EvictorThread.run
    *
-   * @since 3.5.1
+   * @since GemFire 3.5.1
    */
   public void checkLRU()
   {
@@ -2686,7 +2686,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Called after we have delivered our REGION_CREATE event.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private void releaseAfterRegionCreateEventLatch()
   {
@@ -2697,7 +2697,7 @@ public class LocalRegion extends AbstractRegion
    * Used to cause cache listener events to wait until the after region create
    * event is delivered.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private void waitForRegionCreateEvent()
   {
@@ -3146,7 +3146,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void serverRegionDestroy(RegionEventImpl regionEvent) {
     if (regionEvent.getOperation().isDistributed()) {
@@ -3160,7 +3160,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void serverRegionClear(RegionEventImpl regionEvent) {
     if (regionEvent.getOperation().isDistributed()) {
@@ -3173,7 +3173,7 @@ public class LocalRegion extends AbstractRegion
     }
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void serverRegionInvalidate(RegionEventImpl regionEvent) {
     if (regionEvent.getOperation().isDistributed()) {
@@ -3185,7 +3185,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   void serverInvalidate(EntryEventImpl event) {
     if (event.getOperation().isDistributed() && !event.isOriginRemote()) {
@@ -3197,7 +3197,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void serverPut(EntryEventImpl event,
       boolean requireOldValue, Object expectedOldValue) {
@@ -3246,7 +3246,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Destroy an entry on the server given its event.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void serverDestroy(EntryEventImpl event, Object expectedOldValue) {
     if (event.getOperation().isDistributed()) {
@@ -3383,7 +3383,7 @@ public class LocalRegion extends AbstractRegion
   }
 
   /**
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   private final boolean DO_EXPENSIVE_VALIDATIONS = Boolean.getBoolean("gemfire.DO_EXPENSIVE_VALIDATIONS");
 
@@ -3614,7 +3614,7 @@ public class LocalRegion extends AbstractRegion
    *
    * @see RegionMap#getEntry
    *
-   * @since 3.2
+   * @since GemFire 3.2
    */
   public Object getValueInVM(Object key) throws EntryNotFoundException
   {
@@ -3628,7 +3628,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * @param rememberRead true if read should be remembered in a transaction
-   * @since 5.5
+   * @since GemFire 5.5
    */
   private Object basicGetValueInVM(Object key, boolean rememberRead)
     throws EntryNotFoundException
@@ -3662,7 +3662,7 @@ public class LocalRegion extends AbstractRegion
      * @return an unmodifiable set of keys that have been read or written
      * by the transaction on this thread.
      * @throws IllegalStateException if not tx in progress
-     * @since 5.5
+     * @since GemFire 5.5
      */
     public Set testHookTXKeys() {
       if (!isTX()) throw new IllegalStateException(LocalizedStrings.LocalRegion_TX_NOT_IN_PROGRESS.toLocalizedString());
@@ -3692,7 +3692,7 @@ public class LocalRegion extends AbstractRegion
    *
    * @see RegionEntry#getValueOnDisk
    *
-   * @since 3.2
+   * @since GemFire 3.2
    */
   public Object getValueOnDisk(Object key) throws EntryNotFoundException
   {
@@ -3730,7 +3730,7 @@ public class LocalRegion extends AbstractRegion
    * or null if the entry exists but no value data exists.
    * @throws IllegalStateException when the region is not persistent
    * @throws EntryNotFoundException if there is no entry for the given key
-   * @since gemfire5.7_hotfix
+   * @since GemFire 5.7
    */
   public Object getSerializedValueOnDisk(Object key) throws EntryNotFoundException
   {
@@ -3763,7 +3763,7 @@ public class LocalRegion extends AbstractRegion
    *
    * @see RegionEntry#getValueOnDisk
    *
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public Object getValueOnDiskOrBuffer(Object key)
   throws EntryNotFoundException {
@@ -4720,7 +4720,7 @@ public class LocalRegion extends AbstractRegion
    * <p>
    * Acquires and releases the DestroyLock.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void reinitialize(InputStream inputStream, RegionEventImpl event)
       throws TimeoutException, IOException, ClassNotFoundException
@@ -6536,7 +6536,7 @@ public class LocalRegion extends AbstractRegion
    * @param r - a Runnable to wrap the processing of the bulk op
    * @param eventID - the base event ID of the bulk op
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void syncBulkOp(Runnable r, EventID eventID) {
     if (this.eventTracker != null && !isTX()) {
@@ -6873,7 +6873,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Called after this region has been completely created
    *
-   * @since 5.0
+   * @since GemFire 5.0
    *
    * @see DistributedRegion#postDestroyRegion(boolean, RegionEventImpl)
    */
@@ -7030,7 +7030,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Do the expensive work of discovering an existing JTA transaction
    * Only needs to be called at Region.Entry entry points e.g. Region.put, Region.invalidate, etc.
-   * @since tx
+   * @since GemFire tx
    */
   final public void discoverJTA() {
     if (!isSecret() && !isUsedForPartitionedRegionAdmin()
@@ -7041,7 +7041,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * @return true if a transaction is in process
-   * @since tx 
+   * @since GemFire tx
    */
   public final boolean isTX() {
     return getTXState() != null;
@@ -7234,7 +7234,7 @@ public class LocalRegion extends AbstractRegion
    * @param entry the Region entry being destroyed
    * @param event
    *          the event describing the destroy operation
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected void basicDestroyBeforeRemoval(RegionEntry entry, EntryEventImpl event)
   {
@@ -7867,7 +7867,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Release the client connection pool if we have one
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void detachPool() {
     ServerRegionProxy mySRP = getServerProxy();
@@ -8020,7 +8020,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * For each region entry in this region call the callback
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public void foreachRegionEntry(RegionEntryCallback callback) {
     Iterator it = this.entries.regionEntriesInVM().iterator();
@@ -8031,7 +8031,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Used by {@link #foreachRegionEntry}.
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public interface RegionEntryCallback {
     public void handleRegionEntry(RegionEntry re);
@@ -8203,7 +8203,7 @@ public class LocalRegion extends AbstractRegion
    *
    * @return <code>null</code> is a disk region is not desired
    *
-   * @since 3.2
+   * @since GemFire 3.2
    */
   protected DiskRegion createDiskRegion(InternalRegionArguments internalRegionArgs)
       throws DiskAccessException {
@@ -8239,7 +8239,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Returns the object sizer on this region or null if it has no sizer.
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public ObjectSizer getObjectSizer() {
     ObjectSizer result = null;
@@ -9497,7 +9497,7 @@ public class LocalRegion extends AbstractRegion
     // /////////////////////////////////////////
 
     /**
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public Object setValue(Object arg0)
     {
@@ -9529,7 +9529,7 @@ public class LocalRegion extends AbstractRegion
   /**
    * Methods for java.util.Map compliance
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
 
   /**
@@ -10865,7 +10865,7 @@ public class LocalRegion extends AbstractRegion
    * @param topSerial the remote serialNumber for the top region (maybe root)
    * @param subregionSerialNumbers map of remote subregions to serialNumbers
    * @param regionDestroyed true if the region was destroyed on the remote host (as opposed to closed)
-   * @since 5.0
+   * @since GemFire 5.0
    */
   final void handleRemoteLocalRegionDestroyOrClose(
       InternalDistributedMember sender,
@@ -10893,7 +10893,7 @@ public class LocalRegion extends AbstractRegion
    * @param topSerial the remote serialNumber for the top region (maybe root)
    * @param subregionSerialNumbers remote map of subregions to serialNumbers
    * @param regionDestroyed 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private final void basicHandleRemoteLocalRegionDestroyOrClose(
       InternalDistributedMember sender,
@@ -10935,7 +10935,7 @@ public class LocalRegion extends AbstractRegion
    * Remove the specified sender from this regions advisor.
    * @param regionDestroyed 
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   protected void removeSenderFromAdvisor(InternalDistributedMember sender, int serial, boolean regionDestroyed)
   {
@@ -10966,7 +10966,7 @@ public class LocalRegion extends AbstractRegion
 
  /**
    * forces the diskRegion to switch the oplog
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void forceRolling() throws DiskAccessException {
     if(this.diskRegion!=null){
@@ -10994,7 +10994,7 @@ public class LocalRegion extends AbstractRegion
    * get rolled else null if no oplogs were available at the time of signal or region
    * is not having disk persistence. Pls note that the actual number of oplogs 
    * rolled may be more than what is indicated
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   @Override
   public boolean forceCompaction()
@@ -11214,7 +11214,7 @@ public class LocalRegion extends AbstractRegion
 
   /**
    * Called by ccn when a client goes away
-   * @since 5.7
+   * @since GemFire 5.7
    */
   void cleanupForClient(CacheClientNotifier ccn,
                         ClientProxyMembershipID client) {
@@ -11366,7 +11366,7 @@ public class LocalRegion extends AbstractRegion
    * @param function
    * @param args
    * @param filter
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   public ResultCollector executeFunction(final DistributedRegionFunctionExecutor execution, final Function function, final Object args,
       final ResultCollector rc,final Set filter, final ServerToClientFunctionResultSender sender) {   
@@ -11481,7 +11481,7 @@ public class LocalRegion extends AbstractRegion
    * @param localMemoryIsCritical true if the local memory is in a critical state
    * @param critialMembers set of members whose memory is in a critical state
    * @see ResourceManager#setCriticalHeapPercentage(float) and ResourceManager#setCriticalOffHeapPercentage(float)
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public void initialCriticalMembers(boolean localMemoryIsCritical,
       Set<InternalDistributedMember> critialMembers) {
@@ -11586,7 +11586,7 @@ public class LocalRegion extends AbstractRegion
   }
   
   /**
-   * @since SqlFabric
+   * @since GemFire SqlFabric
    *
    */
   void distributeUpdatedProfileOnHubCreation()
@@ -11755,7 +11755,7 @@ public class LocalRegion extends AbstractRegion
     
     /**
      * @return the timestamp that marks the start of the operation
-     * @since 3.5
+     * @since GemFire 3.5
      */
     @Override
     public long startCacheListenerCall() {
@@ -11765,7 +11765,7 @@ public class LocalRegion extends AbstractRegion
     }
     /**
      * @param start the timestamp taken when the operation started 
-     * @since 3.5
+     * @since GemFire 3.5
      */
     @Override
     public void endCacheListenerCall(long start) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegionDataView.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegionDataView.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegionDataView.java
index c26ff10..ae4789d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegionDataView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegionDataView.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.versions.ConcurrentCacheModificationE
 
 /**
  * 
- * @since 6.0tx
+ * @since GemFire 6.0tx
  */
 public class LocalRegionDataView implements InternalDataView {
   /* (non-Javadoc)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MinimumSystemRequirements.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MinimumSystemRequirements.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MinimumSystemRequirements.java
index 4772f8c..775b4ba 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MinimumSystemRequirements.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MinimumSystemRequirements.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Checks that minimum system requirements are met.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class MinimumSystemRequirements {
 
@@ -45,7 +45,7 @@ public final class MinimumSystemRequirements {
    * 
    * @see #checkAndLog()
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static void assertLogAndExit() {
     if (!checkAndLog()) {
@@ -58,7 +58,7 @@ public final class MinimumSystemRequirements {
    * 
    * @return true if minimum system requirements met, otherwise false.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static boolean checkAndLog() {
     boolean minimumSystemRequirementsMet = true;
@@ -77,7 +77,7 @@ public final class MinimumSystemRequirements {
    * 
    * @return true if minimum system requirements met, otherwise false.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static boolean checkJavaVersion() {
     if (SystemUtils.isJavaVersionAtLeast(JAVA_VERSION)) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OpType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OpType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OpType.java
index 8200fa6..f4a49d6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OpType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OpType.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.cache;
  * 
  * @see com.gemstone.gemfire.cache.Operation
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public final class OpType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
index 96f616b..42d1dbc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/Oplog.java
@@ -124,7 +124,7 @@ import com.gemstone.gemfire.pdx.internal.PdxWriterImpl;
  * {@link OverflowOplog}.
  * 
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 
 public final class Oplog implements CompactableOplog, Flushable {
@@ -205,7 +205,7 @@ public final class Oplog implements CompactableOplog, Flushable {
   /**
    * Set to true once compact is called on this oplog.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private volatile boolean compacting = false;
 
@@ -240,7 +240,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * NEW_ENTRY records. 1: EndOfRecord Only needs to be written once per oplog
    * and must preceed any OPLOG_NEW_ENTRY_0ID records.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_NEW_ENTRY_BASE_ID = 63;
   static final int OPLOG_NEW_ENTRY_BASE_REC_SIZE = 1 + 8 + 1;
@@ -250,7 +250,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_NEW_ENTRY_0ID = 64;
 
@@ -260,7 +260,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 1: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_1ID = 65;
   /**
@@ -269,7 +269,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 2: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_2ID = 66;
 
@@ -279,7 +279,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 3: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_3ID = 67;
 
@@ -289,7 +289,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 4: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_4ID = 68;
 
@@ -299,7 +299,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 5: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_5ID = 69;
   /**
@@ -308,7 +308,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 6: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_6ID = 70;
   /**
@@ -317,7 +317,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 7: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_7ID = 71;
   /**
@@ -326,7 +326,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * userBits 8: OplogEntryId RegionId 4: valueLength (optional depending on
    * bits) valueLength: value bytes (optional depending on bits) 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_8ID = 72;
 
@@ -337,7 +337,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_1ID = 73;
   /**
@@ -347,7 +347,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_2ID = 74;
 
@@ -358,7 +358,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_3ID = 75;
 
@@ -369,7 +369,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_4ID = 76;
 
@@ -380,7 +380,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_5ID = 77;
   /**
@@ -390,7 +390,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_6ID = 78;
   /**
@@ -400,7 +400,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_7ID = 79;
   /**
@@ -410,7 +410,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * bits) valueLength: value bytes (optional depending on bits) 4: keyLength
    * keyLength: key bytes 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_MOD_ENTRY_WITH_KEY_8ID = 80;
 
@@ -419,7 +419,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 1 byte. Byte Format: 1:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_1ID = 81;
   /**
@@ -427,7 +427,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 2 bytes. Byte Format: 2:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_2ID = 82;
 
@@ -436,7 +436,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 3 bytes. Byte Format: 3:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_3ID = 83;
 
@@ -445,7 +445,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 4 bytes. Byte Format: 4:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_4ID = 84;
 
@@ -454,7 +454,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 5 bytes. Byte Format: 5:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_5ID = 85;
   /**
@@ -462,7 +462,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 6 bytes. Byte Format: 6:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_6ID = 86;
   /**
@@ -470,7 +470,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 7 bytes. Byte Format: 7:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_7ID = 87;
   /**
@@ -478,7 +478,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * OplogEntryId. The signed difference is encoded in 8 bytes. Byte Format: 8:
    * OplogEntryId 1: EndOfRecord
    *
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private static final byte OPLOG_DEL_ENTRY_8ID = 88;
 
@@ -519,7 +519,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * Each oplog type has a different magic number Followed by EndOfRecord Fix
    * for bug 43824
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   static final byte OPLOG_MAGIC_SEQ_ID = 92;
 
@@ -1277,7 +1277,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * the value This method should never get invoked for an entry which has been
    * destroyed
    * 
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    * @param id
    *          The DiskId for the entry @param offset The offset in this OpLog
    *          where the entry is present. @param faultingIn @param bitOnly
@@ -1436,21 +1436,21 @@ public final class Oplog implements CompactableOplog, Flushable {
    * Used during recovery to calculate the OplogEntryId of the next NEW_ENTRY
    * record.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private long recoverNewEntryId = DiskStoreImpl.INVALID_ID;
   /**
    * Used during writing to remember the last MOD_ENTRY OplogEntryId written to
    * this oplog.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private long writeModEntryId = DiskStoreImpl.INVALID_ID;
   /**
    * Used during recovery to calculate the OplogEntryId of the next MOD_ENTRY
    * record.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private long recoverModEntryId = DiskStoreImpl.INVALID_ID;
   /**
@@ -1465,14 +1465,14 @@ public final class Oplog implements CompactableOplog, Flushable {
    * Used during writing to remember the last DEL_ENTRY OplogEntryId written to
    * this oplog.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private long writeDelEntryId = DiskStoreImpl.INVALID_ID;
   /**
    * Used during recovery to calculate the OplogEntryId of the next DEL_ENTRY
    * record.
    * 
-   * @since prPersistSprint1
+   * @since GemFire prPersistSprint1
    */
   private long recoverDelEntryId = DiskStoreImpl.INVALID_ID;
 
@@ -7885,7 +7885,7 @@ public final class Oplog implements CompactableOplog, Flushable {
    * Used in offline mode to prevent pdx deserialization of keys. The raw bytes
    * are a serialized pdx.
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   private static class RawByteKey implements Sendable {
     final byte[] bytes;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OverflowOplog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OverflowOplog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OverflowOplog.java
index 600f790..bb792a8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OverflowOplog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/OverflowOplog.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * For regions that are persistent (i.e. they can be recovered) see {@link Oplog}.
  * 
  * 
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 class OverflowOplog implements CompactableOplog, Flushable {
   private static final Logger logger = LogService.getLogger();
@@ -309,7 +309,7 @@ class OverflowOplog implements CompactableOplog, Flushable {
    * obatin the value This method should never get invoked for an entry which
    * has been destroyed
    * 
-   * @since 3.2.1 
+   * @since GemFire 3.2.1
    * @param id The DiskId for the entry @param offset The offset in
    *        this OpLog where the entry is present. @param faultingIn @param
    *        bitOnly boolean indicating whether to extract just the UserBit or

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
index 6fe39b1..2ec1e3f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
@@ -938,7 +938,7 @@ public class PRHARedundancyProvider
   /** 
    * Get buddy data stores on the same Host as the accepted member
    * @return set of members on the same host, not including accepted member
-   * @since gemfire59poc
+   * @since GemFire 5.9
    * 
    */
   private Set <InternalDistributedMember> getBuddyMembersInZone(
@@ -957,7 +957,7 @@ public class PRHARedundancyProvider
   /**
    * Early check for resources. This code may be executed for every put operation if
    * there are no datastores present, limit excessive logging.
-   * @since gemfire5.8
+   * @since GemFire 5.8
    */
   private void earlySufficientStoresCheck(String partitionName) {
     assert Assert.assertHoldsLock(this,false);
@@ -975,7 +975,7 @@ public class PRHARedundancyProvider
    * to once per PR after which once every {@link #INSUFFICIENT_LOGGING_THROTTLE_TIME}
    * second
    * @return true if it's time to log
-   * @since gemfire5.8
+   * @since GemFire 5.8
    */
   private boolean shouldLogInsufficientStores() {
     long now = NanoTimer.getTime();
@@ -1285,7 +1285,7 @@ public class PRHARedundancyProvider
    * @param bucketId
    * @param prName
    * @return InternalDistributedMember colocated data store
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   private InternalDistributedMember getColocatedDataStore(
       Collection<InternalDistributedMember> candidates,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
index d1e2bd0..47548f3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionAttributesImpl.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * only in this class and not in {@link PartitionAttributes} are for internal
  * use only.
  *  
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class PartitionAttributesImpl implements PartitionAttributes,
       Cloneable, DataSerializable
@@ -679,7 +679,7 @@ public class PartitionAttributesImpl implements PartitionAttributes,
    * 4. totalNumBuckets should be same for colocated regions<br>
    * 5. redundancy of colocated regions should be same<br>
    * 
-   * @since 5.8Beta
+   * @since GemFire 5.8Beta
    */
   void validateColocation() {
     if (this.colocatedRegionName == null) {
@@ -722,7 +722,7 @@ public class PartitionAttributesImpl implements PartitionAttributes,
    * Only attributes explicitly set in pa will be merged into this.
    * Any attribute set in pa will take precedence over an attribute in this.
    * @param pa the attributes to merge into this.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public void merge(PartitionAttributesImpl pa) {
     if (pa.hasRedundancy) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
index ea207ae..4165fd7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -1730,7 +1730,7 @@ public class PartitionedRegion extends LocalRegion implements
   // /////////////////////////////////////////////////////////////////
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1740,7 +1740,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1752,7 +1752,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1762,7 +1762,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1772,7 +1772,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1781,7 +1781,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1792,7 +1792,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1814,7 +1814,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1826,7 +1826,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1843,7 +1843,7 @@ public class PartitionedRegion extends LocalRegion implements
    * 
    * @see DefaultQuery#execute()
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public Object executeQuery(DefaultQuery query, Object[] parameters,
       Set buckets) throws FunctionDomainException, TypeMismatchException,
@@ -1988,7 +1988,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -1998,7 +1998,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -2008,7 +2008,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException
    * OVERRIDES
    */
@@ -3333,7 +3333,7 @@ public class PartitionedRegion extends LocalRegion implements
   /**
    * Gets the Node for reading or performing a load from a specific bucketId.
    * @return the member from which to read or load
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private InternalDistributedMember getNodeForBucketReadOrLoad(int bucketId) {
     InternalDistributedMember targetNode;
@@ -3531,7 +3531,7 @@ public class PartitionedRegion extends LocalRegion implements
    * @param function
    * @param execution
    * @param rc
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ResultCollector executeFunction(final Function function,
       final PartitionedRegionFunctionExecutor execution, ResultCollector rc,
@@ -3739,7 +3739,7 @@ public class PartitionedRegion extends LocalRegion implements
    * 
    * @param function
    * @param execution
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private ResultCollector executeOnSingleNode(final Function function,
       final PartitionedRegionFunctionExecutor execution, ResultCollector rc, 
@@ -4006,7 +4006,7 @@ public class PartitionedRegion extends LocalRegion implements
    * @param function
    * @param execution
    * @return ResultCollector
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private ResultCollector executeOnAllBuckets(final Function function,
       final PartitionedRegionFunctionExecutor execution, ResultCollector rc, boolean isPRSingleHop) {
@@ -5985,7 +5985,7 @@ public class PartitionedRegion extends LocalRegion implements
    * Called after the cache close has closed all regions. This clean up static
    * pr resources.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static void afterRegionsClosedByCacheClose(GemFireCacheImpl cache) {
     PRQueryProcessor.shutdown();
@@ -6392,7 +6392,7 @@ public class PartitionedRegion extends LocalRegion implements
    * Set view of entries. This currently extends the keySet iterator and
    * performs individual getEntry() operations using the keys
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected class PREntriesSet extends KeysSet {
 
@@ -6633,7 +6633,7 @@ public class PartitionedRegion extends LocalRegion implements
    * Set view of values. This currently extends the keySet iterator and performs
    * individual get() operations using the keys
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected class ValuesSet extends KeysSet  {
 
@@ -6700,7 +6700,7 @@ public class PartitionedRegion extends LocalRegion implements
   }
 
     /**
-   * @since 6.6
+   * @since GemFire 6.6
    */
   @Override
   public boolean containsValue(final Object value) {
@@ -7140,7 +7140,7 @@ public class PartitionedRegion extends LocalRegion implements
    * created the lock, typically used for locking buckets, but not restricted to
    * that usage.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static class BucketLock {
 
@@ -8858,7 +8858,7 @@ public class PartitionedRegion extends LocalRegion implements
    * from queries like getKeysWithRegEx. The implementor creates a method,
    * receiveSet, that consumes the chunks.
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static interface SetCollector {
     public void receiveSet(Set theSet) throws IOException;
@@ -9707,7 +9707,7 @@ public class PartitionedRegion extends LocalRegion implements
    * should *only* be invoked when region is just newly created and has no data
    * or existing buckets else will have undefined behaviour.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setColocatedWith(String colocatedRegionFullPath) {
     ((PartitionAttributesImpl)this.partitionAttributes)
@@ -9720,7 +9720,7 @@ public class PartitionedRegion extends LocalRegion implements
    * RegionMembershipListener invocations. This is copied almost in whole from
    * DistributedRegion
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected class AdvisorListener implements MembershipListener
   {
@@ -10637,7 +10637,7 @@ public class PartitionedRegion extends LocalRegion implements
   /**
    * Returns the local BucketRegion given the key.
    * Returns null if no BucketRegion exists.
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public BucketRegion getBucketRegion(Object key) {
     if (this.dataStore == null)
@@ -10665,7 +10665,7 @@ public class PartitionedRegion extends LocalRegion implements
   /**
    * Test hook to return the per entry overhead for a bucket region.
    * Returns -1 if no buckets exist in this vm. 
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public int getPerEntryLRUOverhead() {
     if (this.dataStore == null) { // this is an accessor

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketMgmtHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketMgmtHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketMgmtHelper.java
index 8ace8b3..2d1ae19 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketMgmtHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketMgmtHelper.java
@@ -36,7 +36,7 @@ public class PartitionedRegionBucketMgmtHelper
    * @param b Bucket to evaluate
    * @param moveSource 
    * @return true if it is allowed to be recovered
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public static boolean bucketIsAllowedOnThisHost(Bucket b, InternalDistributedMember moveSource) {
     if (b.getDistributionManager().enforceUniqueZone()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
index bda68e3..40821c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStore.java
@@ -1871,7 +1871,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats
   /**
    * Returns the local BucketRegion given an bucketId.
    * Returns null if no BucketRegion exists.
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public BucketRegion getLocalBucketById(Integer bucketId) {
     final BucketRegion bucketRegion = this.localBucket2RegionMap.get(bucketId);
@@ -1894,7 +1894,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats
   /**
    * Test hook to return the per entry overhead for a bucket region.
    * PRECONDITION: a bucket must exist and be using LRU.
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public int getPerEntryLRUOverhead() {
     BucketRegion br = (localBucket2RegionMap.values().iterator().next());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataView.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataView.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataView.java
index de1f7d8..02a84ee 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataView.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 
 
 /**
- * @since 6.0tx
+ * @since GemFire 6.0tx
  */
 public class PartitionedRegionDataView extends LocalRegionDataView {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryEvaluator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryEvaluator.java
index 85f058f..5ca17a8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryEvaluator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionQueryEvaluator.java
@@ -92,7 +92,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
 
   /**
    * An ArrayList which might be unconsumable.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static class MemberResultsList extends ArrayList {
     private boolean isLastChunkReceived = false;
@@ -108,7 +108,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
 
   /**
    * Simple testing interface
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public interface TestHook {
     public void hook(final int spot) throws RuntimeException;
@@ -1024,7 +1024,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
    * in multipleThreads and results gained from buckets.
    * In future this can be used for adding for more information to final
    * query running info from pool threads.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static class PRQueryResultCollector {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStats.java
index 43645c6..04d432f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStats.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
  * To manipulate the statistic values, use (inc|dec|set|get)&lt;fieldName&gt;
  * methods.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class PartitionedRegionStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatus.java
index e3dbabd..193d7ba 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionStatus.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.cache;
  * <code>PartitionedRegion</code>s. This class is used by the monitoring tool.
  *
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class PartitionedRegionStatus extends RegionStatus {
   private static final long serialVersionUID = -6755318987122602065L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PlaceHolderDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PlaceHolderDiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PlaceHolderDiskRegion.java
index 50f1ac7..df858f6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PlaceHolderDiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PlaceHolderDiskRegion.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
    * from the DiskInitFile.
    *
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   public class PlaceHolderDiskRegion extends AbstractDiskRegion
       implements DiskRecoveryStore {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolFactoryImpl.java
index 216f3e2..102d0ef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolFactoryImpl.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
 
 /**
  * Implementation of PoolFactory.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PoolFactoryImpl implements PoolFactory {
   private static final Logger logger = LogService.getLogger();
@@ -310,7 +310,7 @@ public class PoolFactoryImpl implements PoolFactory {
    * @throws IllegalStateException if the connection pool name already exists
    * @throws IllegalStateException if this factory does not have any locators or servers
    * @return the newly created connection pool.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Pool create(String name) throws CacheException {
     GemFireCacheImpl cache = GemFireCacheImpl.getInstance();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolManagerImpl.java
index 761f973..bc5441b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolManagerImpl.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Implementation used by PoolManager.
  *
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class PoolManagerImpl {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
index 99876ac..6a6ae3b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
  * GemFire statistics about a Pool 
  *
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PoolStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable.java
index e9796ea..3a582ab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PreferBytesCachedDeserializable.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * You can ask it for its Object in which case it always has to deserialize.
  * So it "prefers serialization (aka bytes)".
  *
- * @since 5.0.2
+ * @since GemFire 5.0.2
  *
  */
 public final class PreferBytesCachedDeserializable implements CachedDeserializable, DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PrimaryBucketException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PrimaryBucketException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PrimaryBucketException.java
index 35502c4..4a5696b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PrimaryBucketException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PrimaryBucketException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireException;
  * An exception thrown if a bucket instance is not primary yet was requested
  * to perform a modification operation. 
  *
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public class PrimaryBucketException extends GemFireException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyBucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyBucketRegion.java
index 245f5b2..7078fe2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyBucketRegion.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * Empty shell for {@link BucketRegion} which exists only to maintain metadata
  * in the form of a {@link BucketAdvisor}
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class ProxyBucketRegion implements Bucket {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
index 74c134b..ee8e0c8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ProxyRegionMap.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
  * Internal implementation of {@link RegionMap}for regions whose DataPolicy is
  * proxy. Proxy maps are always empty.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  * 
  *  
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PutAllPartialResultException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PutAllPartialResultException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PutAllPartialResultException.java
index ee1ea1a..39e1a02 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PutAllPartialResultException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PutAllPartialResultException.java
@@ -30,7 +30,7 @@ import java.util.*;
  *
  *
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class PutAllPartialResultException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
index 2d5a698..22f9903 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/QueuedOperation.java
@@ -28,7 +28,7 @@ import java.io.*;
  * Represents a single operation that can be queued for reliable delivery.
  * Instances are owned in the context of a region.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class QueuedOperation
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionClearedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionClearedException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionClearedException.java
index 5007882..03d6759 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionClearedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionClearedException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache;
 /**
  * Indicates that a Clear Operation happened while an entry operation
  * was in progress, which would result in the ongoing entry operation to abort
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class RegionClearedException extends Exception  {
 private static final long serialVersionUID = 1266503771775907997L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
index 09aef2a..b35eaa3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntry.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * has its own entry class. The "value" field of each of these entries
  * will implement this interface.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
 
 Implementations:
@@ -88,7 +88,7 @@ public interface RegionEntry {
    * Returns true if getLastAccessed, getHitCount, and getMissCount can be called
    * without throwing InternalStatisticsDisabledException.
    * Otherwise returns false.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean hasStats();
     
@@ -200,7 +200,7 @@ public interface RegionEntry {
    * @see InitialImageOperation.RequestImageMessage#chunkEntries
    *
    * @return false if map entry not found
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   public boolean fillInValue(LocalRegion r,
       @Retained(ABSTRACT_REGION_ENTRY_FILL_IN_VALUE) InitialImageOperation.Entry entry,
@@ -271,7 +271,7 @@ public interface RegionEntry {
    * Returns the value as stored by the RegionEntry implementation.  For instance, if compressed this
    * value would be the compressed form.
    *  
-   * @since 8.0
+   * @since GemFire 8.0
    */
   @Retained
   public Object getTransformedValue();
@@ -357,13 +357,13 @@ public interface RegionEntry {
 
   /**
    * @return true if entry's value came from a netsearch
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean getValueWasResultOfSearch();
   /**
    * @param v true if entry's value should be marked as having been
    * the result of a netsearch.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setValueResultOfSearch(boolean v);
 
@@ -372,7 +372,7 @@ public interface RegionEntry {
    * on the disk, ignoring heap data.
    * @param localRegion the persistent region 
    * @return the serialized value from disk
-   * @since gemfire5.7_hotfix
+   * @since GemFire 5.7
    */
   public Object getSerializedValueOnDisk(LocalRegion localRegion);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryContext.java
index abdefaa..064c8f2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryContext.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.compression.Compressor;
 
 /**
  * Provides important contextual information that allows a {@link RegionEntry} to manage its state.
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface RegionEntryContext extends HasCachePerfStats {
   public static final String DEFAULT_COMPRESSION_PROVIDER="com.gemstone.gemfire.compression.SnappyCompressor";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryFactory.java
index efb071c..a5d9d79 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEntryFactory.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.cache;
 /**
  * A factory that produces RegionEntry instances.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
index 2304dea..333dfd2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEventImpl.java
@@ -174,7 +174,7 @@ public class RegionEventImpl
    * Returns the value of the RegionEventImpl field.
    * This is for internal use only. Customers should always call
    * {@link #getCallbackArgument}
-   * @since 5.7 
+   * @since GemFire 5.7
    */
   public Object getRawCallbackArgument() {
     return this.callbackArgument;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEvictorTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEvictorTask.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEvictorTask.java
index ee49b64..2c0115e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEvictorTask.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionEvictorTask.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Takes delta to be evicted and tries to evict the least no of LRU entry which
  * would make evictedBytes more than or equal to the delta
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class RegionEvictorTask implements Callable<Object> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionFactoryImpl.java
index fd3e42d..254d37d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionFactoryImpl.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.client.ClientNotReadyException;
 /**
  * <code>RegionFactoryImpl</code> extends RegionFactory
  * adding {@link RegionShortcut} support.
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public class RegionFactoryImpl<K,V> extends RegionFactory<K,V>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
index a7c2607..a16f1ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMap.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionTag;
  * its entries. Note that the value of every entry in this map will
  * implement {@link RegionEntry}.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMapFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMapFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMapFactory.java
index 7a97408..cfbe4e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMapFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionMapFactory.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.cache;
 /**
  * Used to produce instances of RegionMap
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueue.java
index 0d6a841..5108861 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueue.java
@@ -26,7 +26,7 @@ import java.util.List;
  * implementations backed by regions.
  * 
  * 
- * @since 4.2
+ * @since GemFire 4.2
  */
 public interface RegionQueue
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueueException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueueException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueueException.java
index 1aca59a..ed6c7e5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueueException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionQueueException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
  * An exception thrown by a <code>RegionQueue</code>.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 // Since this exception is in an internal package, we make it
 // a checked exception.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionStatus.java
index 4f5003a..80a16ac 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RegionStatus.java
@@ -29,7 +29,7 @@ import java.io.Serializable;
  * <code>Region</code>s. This class is used by the monitoring tool.
  *
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class RegionStatus implements Serializable {
   private static final long serialVersionUID = 3442040750396350302L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableDistributionData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableDistributionData.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableDistributionData.java
index 30a5c24..a60b7f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableDistributionData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableDistributionData.java
@@ -22,7 +22,7 @@ import java.util.*;
  * Represents one or more distributed operations that can be reliably distributed.
  * This interface allows the data to be queued and checked for reliable distribution.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface ReliableDistributionData  {
 //  /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueue.java
index 5e0ec90..f26470d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueue.java
@@ -26,7 +26,7 @@ import java.util.Set;
  * is done.
  * Instances of this interface can be obtained from {@link ReliableMessageQueueFactory} which can be obtained from {@link GemFireCacheImpl#getReliableMessageQueueFactory}.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface ReliableMessageQueue {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactory.java
index 4a4dcf7..5a86a8f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactory.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.cache;
  * The Cache will have an instance of the factory that can be obtained
  * from {@link GemFireCacheImpl#getReliableMessageQueueFactory}.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface ReliableMessageQueueFactory {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactoryImpl.java
index 170cbb1..57ed7d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ReliableMessageQueueFactoryImpl.java
@@ -24,7 +24,7 @@ import java.util.*;
 /**
  * Implementation of {@link ReliableMessageQueueFactory}
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class ReliableMessageQueueFactoryImpl implements ReliableMessageQueueFactory {
   private boolean closed;
@@ -128,7 +128,7 @@ public class ReliableMessageQueueFactoryImpl implements ReliableMessageQueueFact
 
   /**
    * Implements ReliableMessageQueue.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public class Queue implements ReliableMessageQueue {
     private final DistributedRegion r;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
index acf8723..a1b5d0c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteContainsKeyValueMessage.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 /**
  * This message is used be a replicate region to send a contains key/value request
  * to another peer.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply
   {
@@ -275,7 +275,7 @@ public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageW
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.RemoteContainsKeyValueMessage.RemoteContainsKeyValueReplyMessage}
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static class RemoteContainsKeyValueResponse extends RemoteOperationResponse
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
index f7109bb..822b317 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java
@@ -73,7 +73,7 @@ import static com.gemstone.gemfire.internal.cache.DistributedCacheOperation.VALU
  * frequently, if they are not then it makes sense to fold the destroy and the
  * invalidate into the same message and use an extra bit to differentiate
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *  
  */
 public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply implements OldValueImporter {
@@ -204,7 +204,7 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply
    * on one of the bridge servers.
    * 
    * @param event underlying event.
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void setOldValue(EntryEventImpl event){
     if (event.hasOldValue()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
index 685f0a5..b7cc393 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchEntryMessage.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * reply is sent in a {@link 
  * com.gemstone.gemfire.internal.cache.RemoteFetchEntryMessage.FetchEntryReplyMessage}.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class RemoteFetchEntryMessage extends RemoteOperationMessage
   {
@@ -194,7 +194,7 @@ public final class RemoteFetchEntryMessage extends RemoteOperationMessage
   /**
    * This message is used for the reply to a {@link RemoteFetchEntryMessage}.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class FetchEntryReplyMessage extends ReplyMessage
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
index 12e4de6..21590f6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteFetchVersionMessage.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * DistributedRegions with DataPolicy EMPTY, NORMAL, PRELOADED, can use
  * this message to fetch VersionTag for a key.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class RemoteFetchVersionMessage extends RemoteOperationMessage {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
index b565a2c..7e2be1f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteGetMessage.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.util.BlobHelper;
  * 
  * Replicate regions can use this message to send a Get request to another peer.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public final class RemoteGetMessage extends RemoteOperationMessageWithDirectReply
   {
@@ -228,7 +228,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
    * is used <bold>very </bold> frequently the performance of this class is
    * critical.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final class GetReplyMessage extends ReplyMessage
    {
@@ -363,7 +363,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.RemoteGetMessage.GetReplyMessage}
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class RemoteGetResponse extends RemoteOperationResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
index c4ed1cc..f975f6f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteInvalidateMessage.java
@@ -396,7 +396,7 @@ public final class RemoteInvalidateMessage extends RemoteDestroyMessage {
   }
   /**
    * A processor to capture the value returned by {@link RemoteInvalidateMessage}
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static class InvalidateResponse extends RemoteOperationResponse  {
     private volatile boolean returnValueReceived;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationException.java
index 33d838e..dfaa6c0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.Assert;
  * Indicates that the current non-partitioned region operation failed fatally.
  * 
  * @see com.gemstone.gemfire.internal.cache.RemoteOperationMessage
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class RemoteOperationException extends
     DataLocationException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
index 42ce811..8ffab72 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteOperationMessage.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * The base PartitionedRegion message type upon which other messages should be
  * based.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public abstract class RemoteOperationMessage extends DistributionMessage implements 
     MessageWithReply, TransactionMessage
@@ -470,7 +470,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage impleme
   /**
    * added to support old value to be written on wire.
    * @param value true or false
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setHasOldValue(boolean value) {
     // override in subclasses which need old value to be serialized.
@@ -506,7 +506,7 @@ public abstract class RemoteOperationMessage extends DistributionMessage impleme
    * recipient, capturing any CacheException thrown by the recipient and handle
    * it as an expected exception.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @see #waitForCacheException()
    */
   public static class RemoteOperationResponse extends DirectReplyProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
index ff09af9..045e51c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutAllMessage.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
  * A Replicate Region putAll message.  Meant to be sent only to
  * the peer who hosts transactional data.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply
   {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
index 089dfe8..a4cf7e9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
@@ -131,7 +131,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * (See BlockingHARegionQueue)
  * 
  * 
- * @since 4.3
+ * @since GemFire 4.3
  * 
  */
 public class HARegionQueue implements RegionQueue
@@ -304,13 +304,13 @@ public class HARegionQueue implements RegionQueue
   
   private final CancelCriterion stopper;
   
-  /** @since 5.7 */
+  /** @since GemFire 5.7 */
   protected byte clientConflation = HandShake.CONFLATION_DEFAULT;
   
   /**
    *  Boolean to indicate whether client is a slow receiver 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public boolean isClientSlowReciever = false;
   
@@ -322,7 +322,7 @@ public class HARegionQueue implements RegionQueue
   /**
    * Test hooks for periodic ack
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   static boolean testMarkerMessageRecieved = false;
   static boolean isUsedByTest = false;
@@ -567,7 +567,7 @@ public class HARegionQueue implements RegionQueue
    * 
    * @param val
    * @throws InterruptedException
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void putInQueue(Object val) throws InterruptedException {
     if (val instanceof HAEventWrapper
@@ -584,7 +584,7 @@ public class HARegionQueue implements RegionQueue
 
   /** 
    * Check whether to conflate an event
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected boolean shouldBeConflated(Conflatable event) {
     boolean retVal = event.shouldBeConflated();
@@ -2228,7 +2228,7 @@ public class HARegionQueue implements RegionQueue
    * @throws ClassNotFoundException
    * @throws CacheException
    * @throws InterruptedException
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static HARegionQueue getHARegionQueueInstance(String regionName,
       Cache cache, HARegionQueueAttributes hrqa, final int haRgnQType,
@@ -2878,7 +2878,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
      * @throws ClassNotFoundException
      * @throws CacheException
      * @throws InterruptedException
-     * @since 5.7
+     * @since GemFire 5.7
      */
     TestOnlyHARegionQueue(String regionName, Cache cache, Map haContainer)
         throws IOException, ClassNotFoundException, CacheException,
@@ -2917,7 +2917,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
      * @throws ClassNotFoundException
      * @throws CacheException
      * @throws InterruptedException
-     * @since 5.7
+     * @since GemFire 5.7
      */
     TestOnlyHARegionQueue(String regionName, Cache cache,
         HARegionQueueAttributes hrqa) throws IOException,
@@ -3748,7 +3748,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
    * 
    * @param event
    * @param position
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void putEventInHARegion(Conflatable event, Long position) {
     if (event instanceof HAEventWrapper) {
@@ -3845,7 +3845,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
    * 
    * @param haEventWrapper
    *          An instance of <code>HAEventWrapper</code>
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void putEntryConditionallyIntoHAContainer(
       HAEventWrapper haEventWrapper) {
@@ -3907,7 +3907,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
    * HAEventWrapper instances held by this queue. Also, removes those instances
    * whose referenceCount becomes zero.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void updateHAContainer()
   {
@@ -3981,7 +3981,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
    * 
    * @param conflatable
    * @return An instance of <code>ClientUpdateMessage</code>
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Conflatable getAndRemoveFromHAContainer(Conflatable conflatable) 
   {
@@ -4007,7 +4007,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
    * is zero and put is not in progress, removes the entry from the haContainer.
    * 
    * @param wrapper
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void decAndRemoveFromHAContainer(HAEventWrapper wrapper) 
   {
@@ -4079,7 +4079,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
   
   /**
    * Set client conflation override 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void setClientConflation(byte value) {
     if (value != HandShake.CONFLATION_OFF && 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockUpdateParticipantsMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockUpdateParticipantsMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockUpdateParticipantsMessage.java
index a82b335..8165cea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockUpdateParticipantsMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockUpdateParticipantsMessage.java
@@ -46,7 +46,7 @@ import java.util.Set;
  * @see TXOriginatorRecoveryProcessor
  * @see com.gemstone.gemfire.internal.cache.TXFarSideCMTracker
  * 
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 public final class TXLockUpdateParticipantsMessage
   extends PooledDistributionMessage 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapEvictor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapEvictor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapEvictor.java
index 95b806b..6aac4a9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapEvictor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapEvictor.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
  * Triggers centralized eviction(asynchronously) when the ResourceManager sends
  * an eviction event for on-heap regions. This is registered with the ResourceManager.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class HeapEvictor implements ResourceListener<MemoryEvent> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUCapacityController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUCapacityController.java
index c0b8ef6..948a9d7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUCapacityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUCapacityController.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * options improve the behavior of the <code>HeapLRUCapacityController</code>.
  * 
  * 
- * @since 3.2
+ * @since GemFire 3.2
  */
 @SuppressWarnings("synthetic-access")
 public class HeapLRUCapacityController extends LRUAlgorithm {
@@ -173,7 +173,7 @@ public class HeapLRUCapacityController extends LRUAlgorithm {
   /**
    * Returns a brief description of this eviction controller.
    * 
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Override
   public String toString() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUStatistics.java
index e74793d..cc0e494 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/HeapLRUStatistics.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.*;
  *
  * @see com.gemstone.gemfire.internal.cache.lru.MemLRUCapacityController
  * @see com.gemstone.gemfire.internal.cache.lru.LRUCapacityController
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class HeapLRUStatistics extends LRUStatistics {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUAlgorithm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUAlgorithm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUAlgorithm.java
index b30ed15..3e440ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUAlgorithm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUAlgorithm.java
@@ -69,7 +69,7 @@ import java.util.*;
  * region will result in an {@link IllegalStateException} being
  * thrown.
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public abstract class LRUAlgorithm
   implements CacheCallback, Serializable, Cloneable
@@ -207,7 +207,7 @@ public abstract class LRUAlgorithm
    * This method is an artifact when eviction controllers used to 
    * called capacity controllers and were configured in the cache.xml 
    * file as <code>Declarable</code>
-   * @since 4.1.1
+   * @since GemFire 4.1.1
    */
   public abstract Properties getProperties();
 
@@ -271,7 +271,7 @@ public abstract class LRUAlgorithm
   /**
    * Force subclasses to have a reasonable <code>toString</code>
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Override
   public abstract String toString();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUCapacityController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUCapacityController.java
index 828a4fb..0e5afab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUCapacityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUCapacityController.java
@@ -51,7 +51,7 @@ import java.util.*;
  *  &lt;/region-attributes&gt;
  *  </pre>
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public final class LRUCapacityController extends LRUAlgorithm
   implements Declarable {
@@ -346,7 +346,7 @@ public final class LRUCapacityController extends LRUAlgorithm
   /**
    * Returns a brief description of this capacity controller.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Override
   public String toString() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUClockNode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUClockNode.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUClockNode.java
index 9516fd7..fd11644 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUClockNode.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/LRUClockNode.java
@@ -29,7 +29,7 @@ public interface LRUClockNode {
   public int updateEntrySize(EnableLRU ccHelper);
   /** compute the new entry size and return the delta from the previous entry size
    * @param value then entry's value
-   * @since 6.1.2.9
+   * @since GemFire 6.1.2.9
    */
   public int updateEntrySize(EnableLRU ccHelper, Object value);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/MemLRUCapacityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/MemLRUCapacityController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/MemLRUCapacityController.java
index e62f95d..d1634b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/MemLRUCapacityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/MemLRUCapacityController.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see LRUCapacityController
  *
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public final class MemLRUCapacityController extends LRUAlgorithm
   implements Declarable {
@@ -533,7 +533,7 @@ public final class MemLRUCapacityController extends LRUAlgorithm
   /**
    * Returns a brief description of this capacity controller.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @Override
   public String toString() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/NewLIFOClockHand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/NewLIFOClockHand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/NewLIFOClockHand.java
index 67a135e..4299f1c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/NewLIFOClockHand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/NewLIFOClockHand.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.AbstractRegionEntry;
  * NewLIFOClockHand holds the behavior for LIFO logic , Overwriting
  * getLRUEntry() to return most recently added Entry
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 
 public class NewLIFOClockHand extends NewLRUClockHand {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/OffHeapEvictor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/OffHeapEvictor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/OffHeapEvictor.java
index 693a651..4b1270b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/OffHeapEvictor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/OffHeapEvictor.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.offheap.MemoryAllocator;
  * Triggers centralized eviction(asynchronously) when the ResourceManager sends
  * an eviction event for off-heap regions. This is registered with the ResourceManager.
  *
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapEvictor extends HeapEvictor {
   private static final String EVICTOR_THREAD_GROUP_NAME = "OffHeapEvictorThreadGroup";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/Sizeable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/Sizeable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/Sizeable.java
index 32446c6..be67ebe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/Sizeable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/lru/Sizeable.java
@@ -46,7 +46,7 @@ package com.gemstone.gemfire.internal.cache.lru;
   }<br>
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public interface Sizeable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
index b3a7536..da2fcc7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/operations/ContainsKeyOperationContext.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.operations.KeyOperationContext;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#CONTAINS_KEY} region operation having the
  * key object for the pre-operation case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class ContainsKeyOperationContext extends KeyOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
index 6f5eb00..8951a50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/AllBucketProfilesUpdateMessage.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * A Partitioned Region meta-data update message.  This is used to send 
  * all local bucket's meta-data to other members with the same Partitioned Region.  
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public final class AllBucketProfilesUpdateMessage extends DistributionMessage
     implements MessageWithReply

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/Bucket.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/Bucket.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/Bucket.java
index 094405d..77b1cd3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/Bucket.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/Bucket.java
@@ -64,7 +64,7 @@ public interface Bucket extends CacheDistributionAdvisee {
   /**
    * Report members that are currently hosting the bucket 
    * @return set of members 
-   * @since gemfire59poc
+   * @since GemFire 5.9
    */
   public Set/*InternalDistributedMembers*/ getBucketOwners();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketBackupMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketBackupMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketBackupMessage.java
index 04d25e3..d6eff09 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketBackupMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketBackupMessage.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * if one or more needs to be backed-up in order to satisfy the redundantCopies
  * setting
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class BucketBackupMessage extends PartitionMessage
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketProfileUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketProfileUpdateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketProfileUpdateMessage.java
index 7345b44..1cba153 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketProfileUpdateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketProfileUpdateMessage.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * A Partitioned Region meta-data update message.  This is used to send 
  * a bucket's meta-data to other members with the same Partitioned Region.  
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class BucketProfileUpdateMessage extends DistributionMessage
     implements MessageWithReply

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketSizeMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketSizeMessage.java
index 29d3dfb..5309f1f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketSizeMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/BucketSizeMessage.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 
 /**
  * A message used to determine the number of bytes a Bucket consumes.
- * @since 5.0
+ * @since GemFire 5.0
  */
 
 public final class BucketSizeMessage extends PartitionMessage
@@ -232,7 +232,7 @@ public final class BucketSizeMessage extends PartitionMessage
   /**
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class BucketSizeResponse extends ReplyProcessor21  {
     private volatile long returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
index 4a9c684..f3f534a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ContainsKeyValueMessage.java
@@ -282,7 +282,7 @@ public final class ContainsKeyValueMessage extends PartitionMessageWithDirectRep
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.ContainsKeyValueMessage.ContainsKeyValueReplyMessage}
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class ContainsKeyValueResponse extends PartitionResponse
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/CreateBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/CreateBucketMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/CreateBucketMessage.java
index d8b479f..6a3f4c0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/CreateBucketMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/CreateBucketMessage.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * the redundancy to be impaired if that datastore crashes (even if it
  * never hosted that bucket). 
  *
- * @since 6.0
+ * @since GemFire 6.0
  *
  */
 public final class CreateBucketMessage extends PartitionMessage {
@@ -198,7 +198,7 @@ public final class CreateBucketMessage extends PartitionMessage {
   /**
    * A class that contains the reply to a {@link CreateBucketMessage} message
    * which contains the {@link Node} that has accepted to manage the bucket. 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class CreateBucketReplyMessage extends ReplyMessage {
     private InternalDistributedMember primary;
@@ -296,7 +296,7 @@ public final class CreateBucketMessage extends PartitionMessage {
   
   /**
    * A processor to capture the {@link Node} returned by {@link CreateBucketMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static public class NodeResponse extends ReplyProcessor21 {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
index c706a3c..2700c61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage.java
@@ -71,7 +71,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
  * frequently, if they are not then it makes sense to fold the destroy and the
  * invalidate into the same message and use an extra bit to differentiate
  * 
- * @since 5.0
+ * @since GemFire 5.0
  *  
  */
 public class DestroyMessage extends PartitionMessageWithDirectReply {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
index 0130372..225d1af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/DestroyRegionOnDataStoreMessage.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionDataStore;
  * A message sent to a data store telling that data store to globally
  * destroy the region on behalf of a PR accessor.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class DestroyRegionOnDataStoreMessage extends PartitionMessage
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
index ea47e91..8a6563b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class FetchBulkEntriesMessage extends PartitionMessage
   {
@@ -477,7 +477,7 @@ public final class FetchBulkEntriesMessage extends PartitionMessage
   /**
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.FetchBulkEntriesMessage}
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public static class FetchBulkEntriesResponse extends ReplyProcessor21  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
index d27e33e..d7a3a5f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntriesMessage.java
@@ -448,7 +448,7 @@ public final class FetchEntriesMessage extends PartitionMessage
   /**
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class FetchEntriesResponse extends ReplyProcessor21  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
index ae363ba..fafb546 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchEntryMessage.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * reply is sent in a {@link 
  * com.gemstone.gemfire.internal.cache.partitioned.FetchEntryMessage.FetchEntryReplyMessage}.
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class FetchEntryMessage extends PartitionMessage
   {
@@ -241,7 +241,7 @@ public final class FetchEntryMessage extends PartitionMessage
   /**
    * This message is used for the reply to a {@link FetchEntryMessage}.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class FetchEntryReplyMessage extends ReplyMessage
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
index d7c7d71..3faf1da 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FetchKeysMessage.java
@@ -453,7 +453,7 @@ public final class FetchKeysMessage extends PartitionMessage
   /**
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class FetchKeysResponse extends PartitionResponse  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FlushMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FlushMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FlushMessage.java
index 1d9bf58..089c4ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FlushMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/FlushMessage.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * as the reply.  This was to leverage the fact that the message is a 
  * {@link com.gemstone.gemfire.distributed.internal.SerialDistributionMessage}.</p>
  * 
- * @since 5.1
+ * @since GemFire 5.1
  */
 public final class FlushMessage extends SerialDistributionMessage implements MessageWithReply
 { 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
index 3fef790..76cdeb3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/GetMessage.java
@@ -75,7 +75,7 @@ import com.gemstone.gemfire.internal.util.BlobHelper;
  * Since the {@link com.gemstone.gemfire.cache.Region#get(Object)}operation is
  * used <bold>very </bold> frequently the performance of this class is critical.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class GetMessage extends PartitionMessageWithDirectReply
   {
@@ -327,7 +327,7 @@ public final class GetMessage extends PartitionMessageWithDirectReply
    * is used <bold>very </bold> frequently the performance of this class is
    * critical.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class GetReplyMessage extends ReplyMessage
    {
@@ -534,7 +534,7 @@ public final class GetMessage extends PartitionMessageWithDirectReply
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class GetResponse extends PartitionResponse {
     private volatile GetReplyMessage getReply;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityRequestMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityRequestMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityRequestMessage.java
index 31eb415..44bd06d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityRequestMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityRequestMessage.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 
 /**
  * A message sent to determine the most recent PartitionedRegion identity
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class IdentityRequestMessage extends DistributionMessage implements MessageWithReply
 {
@@ -177,7 +177,7 @@ public final class IdentityRequestMessage extends DistributionMessage implements
   /**
    * The message that contains the <code>Integer</code> identity response to the {@link IdentityRequestMessage}
    *  
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class IdentityReplyMessage extends HighPriorityDistributionMessage {
     private int Id = UNINITIALIZED;
@@ -276,7 +276,7 @@ public final class IdentityRequestMessage extends DistributionMessage implements
   /**
    * The response to a {@link IdentityRequestMessage} use {@link #waitForId()} to 
    * capture the identity
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class IdentityResponse extends ReplyProcessor21  {
     private Integer returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityUpdateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityUpdateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityUpdateMessage.java
index 8605670..18f05e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityUpdateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/IdentityUpdateMessage.java
@@ -145,7 +145,7 @@ public final class IdentityUpdateMessage extends DistributionMessage implements
   
   /**
    * A processor that ignores exceptions, silently removing those nodes that reply with problems
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class IdentityUpdateResponse extends ReplyProcessor21 {
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InterestEventMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InterestEventMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InterestEventMessage.java
index ce242cd..3931e90 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InterestEventMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InterestEventMessage.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * This message is used as the notification that a client interest registration or
  * unregistration event occurred.
  *
- * @since 5.8BetaSUISSE
+ * @since GemFire 5.8BetaSUISSE
  */
 public class InterestEventMessage extends PartitionMessage {
   private static final Logger logger = LogService.getLogger();
@@ -157,7 +157,7 @@ public class InterestEventMessage extends PartitionMessage {
   /**
    * This message is used for the reply to a {@link InterestEventMessage}.
    *
-   * @since 5.8BetaSUISSE
+   * @since GemFire 5.8BetaSUISSE
    */
   public static class InterestEventReplyMessage extends
       HighPriorityDistributionMessage {
@@ -248,7 +248,7 @@ public class InterestEventMessage extends PartitionMessage {
    * A processor to capture the value returned by {@link
    * com.gemstone.gemfire.internal.cache.partitioned.InterestEventMessage.InterestEventReplyMessage}
    *
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static class InterestEventResponse extends PartitionResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
index 60508c1..6f86acd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/InvalidateMessage.java
@@ -89,7 +89,7 @@ public final class InvalidateMessage extends DestroyMessage {
    * @param original invalidateMessage originated at remote vm.
    * @param event EntryEventImpl generated by operation on the bucket region.
    * @param members list of members which needs old value.
-   * @since 5.5
+   * @since GemFire 5.5
    */
   InvalidateMessage(InvalidateMessage original, EntryEventImpl event, Set members) {
     super(original, event, members);
@@ -364,7 +364,7 @@ public final class InvalidateMessage extends DestroyMessage {
   }
   /**
    * A processor to capture the value returned by {@link InvalidateMessage}
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static class InvalidateResponse extends PartitionResponse  {
     private volatile boolean returnValueReceived;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBackupBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBackupBucketMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBackupBucketMessage.java
index 7c9070a..3ff2dae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBackupBucketMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBackupBucketMessage.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 /**
  * A request to manage a particular bucket
  *
- * @since 5.0
+ * @since GemFire 5.0
  *
  */
 public final class ManageBackupBucketMessage extends PartitionMessage {
@@ -224,7 +224,7 @@ public final class ManageBackupBucketMessage extends PartitionMessage {
   /**
    * A class that contains the reply to a {@link ManageBackupBucketMessage} message
    * which contains the {@link Node} that has accepted to manage the bucket. 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class ManageBackupBucketReplyMessage extends ReplyMessage {
     
@@ -352,7 +352,7 @@ public final class ManageBackupBucketMessage extends PartitionMessage {
   
   /**
    * A processor to capture the {@link Node} returned by {@link ManageBackupBucketMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static public class NodeResponse extends ReplyProcessor21 {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBucketMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBucketMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBucketMessage.java
index 25acd5a..3ca238c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBucketMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/ManageBucketMessage.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 /**
  * A request to manage a particular bucket
  *
- * @since 5.0
+ * @since GemFire 5.0
  *
  */
 public final class ManageBucketMessage extends PartitionMessage {
@@ -209,7 +209,7 @@ public final class ManageBucketMessage extends PartitionMessage {
   /**
    * A class that contains the reply to a {@link ManageBucketMessage} message
    * which contains the {@link Node} that has accepted to manage the bucket. 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class ManageBucketReplyMessage extends ReplyMessage {
     
@@ -337,7 +337,7 @@ public final class ManageBucketMessage extends PartitionMessage {
   
   /**
    * A processor to capture the {@link Node} returned by {@link ManageBucketMessage}
-   * @since 5.0
+   * @since GemFire 5.0
    */
   static public class NodeResponse extends ReplyProcessor21  {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLoad.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLoad.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLoad.java
index f8f1f78..c33f8b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLoad.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLoad.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.DataSerializer;
  * A class which holds the load for a partitioned region
  * on a given VM.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public final class PRLoad implements DataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLocallyDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLocallyDestroyedException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLocallyDestroyedException.java
index 6ea159e..d5d3fef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLocallyDestroyedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRLocallyDestroyedException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.DataLocationException;
 /**
  * An exception indicating that a PartitionedRegion was found to be Locally
  * Destroyed
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public class PRLocallyDestroyedException extends DataLocationException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRTombstoneMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRTombstoneMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRTombstoneMessage.java
index d004182..d5d43cb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRTombstoneMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PRTombstoneMessage.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 
 /**
  * This message class sends tombstone GC information to other PR holders
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class PRTombstoneMessage extends PartitionMessageWithDirectReply
   implements SerializationVersions {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
index 626efef..db4cc59 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage.java
@@ -71,7 +71,7 @@ import com.gemstone.gemfire.internal.sequencelog.EntryLogger;
  * The base PartitionedRegion message type upon which other messages should be
  * based.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public abstract class PartitionMessage extends DistributionMessage implements 
     MessageWithReply, TransactionMessage
@@ -644,7 +644,7 @@ public abstract class PartitionMessage extends DistributionMessage implements
   /**
    * added to support old value to be written on wire.
    * @param value true or false
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void setHasOldValue(boolean value) {
     // override in subclasses which need old value to be serialized.
@@ -700,7 +700,7 @@ public abstract class PartitionMessage extends DistributionMessage implements
    * recipient, capturing any CacheException thrown by the recipient and handle
    * it as an expected exception.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    * @see #waitForCacheException()
    */
   public static class PartitionResponse extends DirectReplyProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PrimaryRequestMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PrimaryRequestMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PrimaryRequestMessage.java
index 5ae1b1f..42ff7bc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PrimaryRequestMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PrimaryRequestMessage.java
@@ -180,7 +180,7 @@ public final class PrimaryRequestMessage extends PartitionMessage
 
   /**
    * A processor to capture the member who was selected as primary for the bucket requested
-   * @since 5.1
+   * @since GemFire 5.1
    */
   static public class PrimaryResponse extends ReplyProcessor21 {
     private volatile PrimaryRequestReplyMessage msg;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
index 8aaf587..7bbe5ce 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutAllPRMessage.java
@@ -80,7 +80,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
  * a bucket's primary owner.  In addition to updating an entry it is also used to
  * send Partitioned Region event information.
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 public final class PutAllPRMessage extends PartitionMessageWithDirectReply
 {
@@ -839,7 +839,7 @@ public final class PutAllPRMessage extends PartitionMessageWithDirectReply
   
   /**
    * A processor to capture the value returned by {@link PutAllPRMessage}
-   * @since 5.8
+   * @since GemFire 5.8
    */
   public static class PutAllResponse extends PartitionResponse {
     private volatile boolean returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
index a6a39dc..db137c6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/PutMessage.java
@@ -80,7 +80,7 @@ import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifie
  * a bucket's primary owner.  In addition to updating an entry it is also used to
  * send Partitioned Region event information.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class PutMessage extends PartitionMessageWithDirectReply implements NewValueImporter {
   private static final Logger logger = LogService.getLogger();
@@ -1205,7 +1205,7 @@ public final class PutMessage extends PartitionMessageWithDirectReply implements
 
   /**
    * A processor to capture the value returned by {@link PutMessage}
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static class PutResponse extends PartitionResponse  {
     private volatile boolean returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
index 03df3fb..bdb3c25 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
@@ -556,7 +556,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor
     /**
      * requiresNotification determines whether a member needs to be notified of cache
      * operations so that cache listeners and other hooks can be engaged
-     * @since 5.1
+     * @since GemFire 5.1
      */
     public boolean requiresNotification = false;
 
@@ -1033,7 +1033,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor
   
   /**
    * return the set of all members who must receive operation notifications
-   * @since 5.1
+   * @since GemFire 5.1
    * */
   public Set adviseRequiresNotification(final EntryEventImpl event) {
     return adviseFilter(new Filter() {
@@ -1816,7 +1816,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor
    * A real bucket profile is one that for a bucket that actually has storage
    * in this vm.
    * @return a list of BucketProfileAndId instances; may be null
-   * @since 5.5 
+   * @since GemFire 5.5
    */
   public ArrayList getBucketRegionProfiles() {
     final ProxyBucketRegion[] bucs = this.buckets;
@@ -1842,7 +1842,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor
   /**
    * Takes a list of BucketProfileAndId and adds them to thsi advisors
    * proxy buckets.
-   * @since 5.5 
+   * @since GemFire 5.5
    */
   public void putBucketRegionProfiles(ArrayList l) {
     int size = l.size();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteSizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteSizeMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteSizeMessage.java
index 566a222..f909692 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteSizeMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoteSizeMessage.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * This message is used to determine the number of Entries in a Region, or its
  * size.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class RemoteSizeMessage extends RemoteOperationMessage
   {
@@ -301,7 +301,7 @@ public final class RemoteSizeMessage extends RemoteOperationMessage
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class SizeResponse extends ReplyProcessor21
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
index fb46e0c..125cdb0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RemoveAllPRMessage.java
@@ -79,7 +79,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
 /**
  * PR removeAll
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply
 {
@@ -769,7 +769,7 @@ public final class RemoveAllPRMessage extends PartitionMessageWithDirectReply
   
   /**
    * A processor to capture the value returned by {@link RemoveAllPRMessage}
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static class RemoveAllResponse extends PartitionResponse {
     private volatile boolean returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizeMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizeMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizeMessage.java
index 2c5064e..1fa049a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizeMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizeMessage.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * This message is used to determine the number of Entries in a Region, or its
  * size.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class SizeMessage extends PartitionMessage
   {
@@ -312,7 +312,7 @@ public final class SizeMessage extends PartitionMessage
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.partitioned.GetMessage.GetReplyMessage}
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static class SizeResponse extends ReplyProcessor21
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizedBasedLoadProbe.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizedBasedLoadProbe.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizedBasedLoadProbe.java
index 52a7c5f..068c6a4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizedBasedLoadProbe.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/SizedBasedLoadProbe.java
@@ -29,7 +29,7 @@ import java.io.IOException;
  * A load probe which calculates the load of a pr using
  * the size of the buckets in bytes.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class SizedBasedLoadProbe implements LoadProbe, DataSerializableFixedID {
   private static final long serialVersionUID = 7040814060882774875L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
index 1cfa4a4..6111561 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java
@@ -70,7 +70,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * 
  * This model is not threadsafe.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 @SuppressWarnings("synthetic-access")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/BytesAndBits.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/BytesAndBits.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/BytesAndBits.java
index e5af55b..c55dae0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/BytesAndBits.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/BytesAndBits.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.Version;
 /**
  * Used to fetch a record's raw bytes and user bits.
  *
- * @since prPersistSprint1
+ * @since GemFire prPersistSprint1
  */
 public class BytesAndBits {
   private final byte[] data;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/DiskRecoveryStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/DiskRecoveryStore.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/DiskRecoveryStore.java
index a9238c8..4d2e80d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/DiskRecoveryStore.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/DiskRecoveryStore.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.cache.versions.VersionTag;
  * The primary implementor of this interface is LocalRegion.
  *
  *
- * @since prPersistSprint3
+ * @since GemFire prPersistSprint3
  */
 public interface DiskRecoveryStore {
   public DiskRegionView getDiskRegionView();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberPattern.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberPattern.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberPattern.java
index 193a558..a0e1f0a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberPattern.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/PersistentMemberPattern.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.SocketCreator;
  * has revoked. Any fields that are null will be considered a wildcard
  * matching any members.
  * 
- * @since prPersistSprint1
+ * @since GemFire prPersistSprint1
  */
 public class PersistentMemberPattern implements PersistentID, Comparable<PersistentMemberPattern> {
   protected InetAddress host;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/IndexMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/IndexMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/IndexMap.java
index c51d38b..9d906ce 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/IndexMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/IndexMap.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.cache.CachedDeserializable;
  * 
  * TODO - Do we need getKey, getValue, 
  *
- * @since cedar
+ * @since GemFire cedar
  */
 public interface IndexMap {
 
@@ -163,7 +163,7 @@ public interface IndexMap {
 
   /**
    * A single entry in an index
-   * @since cedar
+   * @since GemFire cedar
    */
   interface IndexEntry {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultBag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultBag.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultBag.java
index c7cf05e..e24ab90 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultBag.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultBag.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.CachedDeserializable;
  * The result set should be closed using the close method to free up resources
  * when it is no longer in use.
  * 
- * @since cedar
+ * @since GemFire cedar
  */
 public interface ResultBag {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultList.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultList.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultList.java
index 26cb115..9e04bc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultList.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultList.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.CachedDeserializable;
  * may or may not reflect modifications to the set while the iteration is in progress.
  * They will guarantee that entries will be returned in the correct order.
  * 
- * @since cedar
+ * @since GemFire cedar
  */
 public interface ResultList {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultMap.java
index 5c86c5d..6ca2ee1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultMap.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.CachedDeserializable;
  * 
  * The key and value are both allowed to be an object, or a CachedDeserializable.
  * 
- * @since cedar
+ * @since GemFire cedar
  */
 public interface ResultMap {
 
@@ -107,7 +107,7 @@ public interface ResultMap {
 
   /**
    * A single entry in an index
-   * @since cedar
+   * @since GemFire cedar
    */
   interface Entry {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultSet.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultSet.java
index 2649118..47ec854 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/persistence/query/ResultSet.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.CachedDeserializable;
  * The result set should be closed using the close method to free up resources
  * when it is no longer in use.
  * 
- * @since cedar
+ * @since GemFire cedar
  */
 public interface ResultSet {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/properties.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/properties.html b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/properties.html
index 1cd1b72..5c27a71 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/properties.html
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/properties.html
@@ -2568,7 +2568,7 @@ See <code>com.gemstone.gemfire.distributed.DistributedSystem#PROPERTY_FILE</code
      system path then the above search is done.  If it is an absolute
      file system path then that file must exist; no search for it is
      done.
-     @since 5.0
+     @since GemFire 5.0
 </pre>
 <p>
 TBA

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/Acceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/Acceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/Acceptor.java
index 59cd367..1d1100b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/Acceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/Acceptor.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.Version;
  * Server. Multiple communication stacks may provide implementations for the
  * interfaces defined in this package
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public abstract class Acceptor
 {
@@ -80,7 +80,7 @@ public abstract class Acceptor
 
   /**
    * The GFE version of the server.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final Version VERSION = Version.CURRENT.getGemFireVersion();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/BatchException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/BatchException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/BatchException.java
index f5b761d..38718ee 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/BatchException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/BatchException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  * An exception thrown during batch processing.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 // Note that since this class is inside of an internal package,
 // we make it extend Exception, thereby making it a checked exception.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
index 4e382f5..8897dd7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.InternalCache;
 /**
  * Helper class that maintains a weak hashmap of referenced regions
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class CachedRegionHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ClientHandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ClientHandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ClientHandShake.java
index 0906bd5..51e537a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ClientHandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ClientHandShake.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 /**
  * <code>ClientHandShake</code> represents a handshake from the client.
  *   
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface ClientHandShake {
   public boolean isOK();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ConnectionProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ConnectionProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ConnectionProxy.java
index 02f1714..a0e6252 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ConnectionProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/ConnectionProxy.java
@@ -21,14 +21,14 @@ import com.gemstone.gemfire.internal.Version;
 /**
  * Provides the version of the client.
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 @SuppressWarnings("deprecation")
 public interface ConnectionProxy {
 
 /**
    * The GFE version of the client.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final Version VERSION = Version.CURRENT.getGemFireVersion();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InterestType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InterestType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InterestType.java
index ccacb5f..469d7d7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InterestType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InterestType.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.cache.tier;
  * Pre-defined interest list types supported by the system
  *
  * @version $Revision: 13166 $
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class InterestType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
index 7e1ae2a..04752b3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/InternalClientMembership.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.management.membership.ClientMembershipListener;
  * <code>ClientMembershipListener</code>s. The public counterpart for this
  * class is {@link com.gemstone.gemfire.management.membership.ClientMembership}.
  *
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 public final class InternalClientMembership  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/MessageType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/MessageType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/MessageType.java
index fdba064..4af7ccc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/MessageType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/MessageType.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.cache.tier;
 /**
  * Pre-defined message types supported by the system
  *
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 public class MessageType {
   /** An invalid message, typically due to problems receiving a complete message */
@@ -47,118 +47,118 @@ public class MessageType {
 
   /** Put data into the cache
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int PUT = 7;
 
   /** The put request data was bad (null key or value, for example)
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int PUT_DATA_ERROR = 8;
 
   /** Destroy an entry from the cache
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int DESTROY = 9;
 
   /** The destroy request data was bad (null key, for example)
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int DESTROY_DATA_ERROR = 10;
 
   /** Destroy a region from the cache
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int DESTROY_REGION = 11;
 
   /** The destroy region request data was bad (null region name, for example)
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int DESTROY_REGION_DATA_ERROR = 12;
 
   /** A client wished to be notified of updates
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int CLIENT_NOTIFICATION = 13;
 
   /** Information about a client receiving updates has changed
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public static final int UPDATE_CLIENT_NOTIFICATION = 14;
 
   /** The receiver (which is an edge client in this case) should
    * locally invalidate a piece of data
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int LOCAL_INVALIDATE = 15;
 
   /** The receiver (which is an edge client in this case) should
    * locally destroy a piece of data
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int LOCAL_DESTROY = 16;
 
   /** The receiver (which is an edge client in this case) should
    * locally destroy a region
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int LOCAL_DESTROY_REGION = 17;
 
   /** A message to close the client connection
    *
-   * @since 3.5 */
+   * @since GemFire 3.5 */
   public static final int CLOSE_CONNECTION = 18;
 
   /** A message to process a batch of messages
    *
-   * @since 4.1.1 */
+   * @since GemFire 4.1.1 */
   public static final int PROCESS_BATCH = 19;
 
   /** A message to register interest in a specific key
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int REGISTER_INTEREST = 20;
 
   /** The register interest request data was bad (null region name, for example)
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int REGISTER_INTEREST_DATA_ERROR = 21;
 
   /** A message to unregister interest in a specific key
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int UNREGISTER_INTEREST = 22;
 
   /** The unregister interest request data was bad (null region name, for example)
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int UNREGISTER_INTEREST_DATA_ERROR = 23;
 
   /** A message to register interest in a specific list of keys
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int REGISTER_INTEREST_LIST = 24;
 
   /** A message to unregister interest in a specific list of keys
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int UNREGISTER_INTEREST_LIST = 25;
 
   /** An unknown message type. This is being used for responses.
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int UNKNOWN_MESSAGE_TYPE_ERROR = 26;
 
   /** The receiver (which is an edge client in this case) should
    * locally create a piece of data
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int LOCAL_CREATE = 27;
 
   /** The receiver (which is an edge client in this case) should
    * locally update a piece of data
    *
-   * @since 4.1.2 */
+   * @since GemFire 4.1.2 */
   public static final int LOCAL_UPDATE = 28;
 
   public static final int CREATE_REGION = 29;
@@ -166,17 +166,17 @@ public class MessageType {
 
   /**
    * A message to make primary server
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static final int MAKE_PRIMARY = 31;
 
   /** Response message type from primary server
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static final int RESPONSE_FROM_PRIMARY = 32;
 
   /** Response message type from secondary server
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static final int RESPONSE_FROM_SECONDARY = 33;
 
@@ -184,7 +184,7 @@ public class MessageType {
    * A query request message
    *
    * <p>author gregp
-   * @since 4.1.1
+   * @since GemFire 4.1.1
    */
   public static final int QUERY = 34;
 
@@ -222,7 +222,7 @@ public class MessageType {
   
   /** A message to register the Instantiators. 
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */ 
   public static final int REGISTER_INSTANTIATORS = 51; 
 
@@ -319,10 +319,10 @@ public class MessageType {
 
   public static final int GET_ALL_70 = 100;
 
-  /** gets the pdx type definitions @since 7.0 */
+  /** gets the pdx type definitions @since GemFire 7.0 */
   public static final int GET_PDX_TYPES = 101;
 
-  /** gets the pdx enum definitions @since 7.0 */
+  /** gets the pdx enum definitions @since GemFire 7.0 */
   public static final int GET_PDX_ENUMS = 102;
 
   public static final int TOMBSTONE_OPERATION = 103;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index c2f3828..e1c22b7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -95,7 +95,7 @@ import com.gemstone.gemfire.internal.util.ArrayUtils;
  * Implements the acceptor thread on the bridge server. Accepts connections from
  * the edge and starts up threads to process requests from these.
  * 
- * @since 2.0.2
+ * @since GemFire 2.0.2
  */
 @SuppressWarnings("deprecation")
 public class AcceptorImpl extends Acceptor implements Runnable
@@ -243,7 +243,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
    * The ip address or host name this acceptor is to bind to;
    * <code>null</code> or "" indicates
    * it will listen on all local addresses.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private final String bindHostName;
   
@@ -296,7 +296,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
    * 
    * @see SocketCreator#createServerSocket(int, int, InetAddress)
    * @see ClientHealthMonitor
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public AcceptorImpl(int port,
                       String bindHostName, boolean notifyBySubscription,
@@ -1700,7 +1700,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
 //   /**
 //    * Calculates the bind address based on gemfire.properties.
 //    * Returns null if no bind address is configured.
-//    * @since 5.7
+//    * @since GemFire 5.7
 //    */
 //   public static InetAddress calcBindAddress(Cache cache) throws IOException {
 //     InternalDistributedSystem system = (InternalDistributedSystem)cache
@@ -1728,7 +1728,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
    * @return the ip address or host name this acceptor will listen on.
    *         An "" if all local addresses will be listened to.
    
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private static String calcBindHostName(Cache cache, String bindName) {
     if (bindName != null && !bindName.equals("")) {
@@ -1766,7 +1766,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
   /**
    * Gets the address that this bridge server can be contacted on from external
    * processes.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getExternalAddress() {
     String result = this.bindHostName;


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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index c3eccd2..d2ff280 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * com.gemstone.gemfire.cache.Cache} and vice versa. It provides helper methods
  * and constants.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
@@ -48,7 +48,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * Whenever you upgrade the DTD, you will need to search for occurrences of
    * the previous version strings and upgrade them as well.
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public static final String VERSION_LATEST = CacheXml.VERSION_1_0;
   
@@ -67,28 +67,28 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /**
    * Namespace URI for older, GemFire {@link CacheXml} documents.
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String GEMFIRE_NAMESPACE = "http://schema.pivotal.io/gemfire/cache";
 
   /**
    * Namespace URI for {@link CacheXml} documents.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String GEODE_NAMESPACE = "http://geode.apache.org/schema/cache";
 
   /**
    * Namespace prefix for {@link CacheXml} documents.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String PREFIX = "cache";
 
   /**
    * Latest schema location for {@link #GEODE_NAMESPACE}.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String LATEST_SCHEMA_LOCATION = CacheXml.SCHEMA_1_0_LOCATION;
   
@@ -103,27 +103,27 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /**
    * Version string for GemFire 8.1
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String VERSION_8_1 = "8.1";
   
   /**
    * Version string for Geode 1.0
    * 
-   * @since 1.0
+   * @since Geode 1.0
    */
   public static final String VERSION_1_0 = "1.0";
   
   /**
    * The location of the GemFire 8.1 schema file.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   protected static final String SCHEMA_8_1_LOCATION = "http://schema.pivotal.io/gemfire/cache/cache-8.1.xsd";
   /**
-   * The location of the Geeode 1.0 schema file.
+   * The location of the Geode 1.0 schema file.
    * 
-   * @since 1.0
+   * @since Geode 1.0
    */
   protected static final String SCHEMA_1_0_LOCATION = "http://geode.apache.org/schema/cache/cache-1.0.xsd";
 
@@ -767,7 +767,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /** The name of the <code>compressor</code> attribute */
   protected static final String COMPRESSOR = "compressor";
   /** The name of the <code>off-heap</code> attribute
-   * @since 9.0
+   * @since Geode 1.0
    */
   protected static final String OFF_HEAP = "off-heap";
  
@@ -886,7 +886,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @return {@link InputSource} for resolved entity if found, otherwise null.
    * @throws IOException 
    * @throws SAXException 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private InputSource resolveEntityByEntityResolvers(String name, String publicId, String baseURI, String systemId) throws SAXException, IOException {
     final ServiceLoader<EntityResolver2> entityResolvers = ServiceLoader.load(EntityResolver2.class, ClassPathLoader.getLatest().asClassLoader());
@@ -924,7 +924,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param attributes
    * @param name
    * @return String value for named attribute or null if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String getString(final Attributes attributes, final String name) {
     return getString(attributes, name, null);
@@ -936,7 +936,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param name
    * @param defaultValue
    * @return String value for named attribute or <code>defaultValue</code> if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final String getString(final Attributes attributes, final String name, final String defaultValue) {
     final String value = attributes.getValue(name);
@@ -951,7 +951,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param attributes
    * @param name
    * @return Integer value for named attribute or null if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Integer getInteger(final Attributes attributes, final String name) {
     return getInteger(attributes, name, null);
@@ -963,7 +963,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param name
    * @param defaultValue
    * @return Integer value for named attribute or <code>defaultValue</code> if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Integer getInteger(final Attributes attributes, final String name, final Integer defaultValue) {
     final String value = attributes.getValue(name);
@@ -978,7 +978,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param attributes
    * @param name
    * @return Boolean value for named attribute or null if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Boolean getBoolean(final Attributes attributes, final String name) {
     return getBoolean(attributes, name, null);
@@ -990,7 +990,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param name
    * @param defaultValue
    * @return Boolean value for named attribute or <code>defaultValue</code> if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Boolean getBoolean(final Attributes attributes, final String name, final Boolean defaultValue) {
     final String value = attributes.getValue(name);
@@ -1006,7 +1006,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param name
    * @param clazz
    * @return Enum value for named attribute or null if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name, final Class<E> clazz) {
     return getEnum(attributes, name, clazz, null);
@@ -1019,7 +1019,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * @param clazz
    * @param defaultValue
    * @return Enum value for named attribute or <code>defaultValue</code> if attribute not defined.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final <E extends Enum<E>> E getEnum(final Attributes attributes, final String name, final Class<E> clazz, E defaultValue) {
     String value = attributes.getValue(name);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
index f0b1368..17076db 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -130,7 +130,7 @@ import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer;
  * but it is conceivable that it could be used in the product as well.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @SuppressWarnings("deprecation")
 public class CacheXmlGenerator extends CacheXml implements XMLReader {
@@ -177,7 +177,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    *        The version of GemFire whose DTD/schema should be used in
    *        the generated XML.  See {@link #VERSION_4_0}.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static void generate(Cache cache, PrintWriter pw,
                               boolean useSchema, String version) {
@@ -245,7 +245,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    *        The version of GemFire whose DTD/schema should be used in
    *        the generated XML.  See {@link #VERSION_4_0}.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static void generate(ClientCache cache, PrintWriter pw,
                               boolean useSchema, String version) {
@@ -949,7 +949,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
    * Generates XML for the client-subscription tag
    * @param bridge instance of <code>CacheServer</code>
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   
   private void generateClientHaQueue(CacheServer bridge) throws SAXException {
@@ -978,7 +978,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates XML for the given cache server
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private void generate(CacheServer bridge) throws SAXException {
     if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) < 0) {
@@ -1094,7 +1094,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates XML for the given disk store
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   private void generate(DiskStore ds) throws SAXException {
     if (this.version.compareTo(CacheXmlVersion.GEMFIRE_6_5) < 0) {
@@ -1217,7 +1217,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates XML for the given connection pool
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void generate(Pool cp) throws SAXException {
     if (this.version.compareTo(CacheXmlVersion.GEMFIRE_5_7) < 0) {
@@ -1321,7 +1321,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates XML for a CacheTransactionManager
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private void generate(CacheTransactionManager txMgr) throws SAXException {
     if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_0) < 0) {
@@ -1352,7 +1352,7 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates XML for a DynamicRegionFactory.Config
    *
-   * @since 4.3
+   * @since GemFire 4.3
    */
   private void generateDynamicRegionFactory(Cache c) throws SAXException {
     if (this.version.compareTo(CacheXmlVersion.GEMFIRE_4_1) < 0) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
index aec2dc3..76ab0f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlParser.java
@@ -130,7 +130,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
  * the {@link Cache}/{@link ClientCache},{@link Region}s, etc.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @SuppressWarnings("deprecation")
 public class CacheXmlParser extends CacheXml implements ContentHandler {
@@ -138,17 +138,17 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
   private static final Logger logger = LogService.getLogger();
   
   /**
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final String BUFFER_SIZE = "http://apache.org/xml/properties/input-buffer-size";
 
   /**
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final String DISALLOW_DOCTYPE_DECL_FEATURE = "http://apache.org/xml/features/disallow-doctype-decl";
 
   /**
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
 
@@ -160,14 +160,14 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
   /**
    * Delegate {@link XmlParser}s mapped by namespace URI.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private HashMap<String, XmlParser> delegates = new HashMap<>();
 
   /**
    * Document {@link Locator} used for {@link SAXParseException}.
    * 
-   * @since 8.2
+   * @since GemFire 8.2
    */
   protected Locator documentLocator;
 
@@ -184,7 +184,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    *
    * @throws CacheXmlException Something went wrong while parsing the XML
    *
-   * @since 4.0
+   * @since GemFire 4.0
    *
    */
   public static CacheXmlParser parse(InputStream is) {
@@ -406,7 +406,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     stack.push(this.cache);
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void startPool(Attributes atts) {
     PoolFactory f = this.cache.createPoolFactory();
@@ -488,7 +488,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     }
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void endPool() {
     PoolFactory f = (PoolFactory)stack.pop();
@@ -496,7 +496,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     f.create(name);
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void doLocator(Attributes atts) {
     PoolFactory f = (PoolFactory)stack.peek();
@@ -505,7 +505,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     f.addLocator(host, port);
   }
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void doServer(Attributes atts) {
     PoolFactory f = (PoolFactory)stack.peek();
@@ -518,7 +518,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * When a <code>cache-server</code> element is first encountered, we create
    * a new {@link CacheCreation#addCacheServer() CacheServer} in the cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private void startCacheServer(Attributes atts) {
     CacheServer bridge = this.cache.addCacheServer();
@@ -809,7 +809,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * When a <code>load-probe</code> element is encountered,
    * create a new probe for the current <code>CacheServer</code>.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void endLoadProbe() {
     Declarable d = createDeclarable();
@@ -1320,7 +1320,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
 
   /**
    * finish parsing a "group" element which is just a string
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void endGroup() {
     StringBuffer str = (StringBuffer) stack.pop();
@@ -2861,7 +2861,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * @param namespaceUri
    *          to find {@link XmlParser} for.
    * @return {@link XmlParser} if found, otherwise null.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   // UnitTest CacheXmlParser.testGetDelegate()
   private XmlParser getDelegate(final String namespaceUri) {
@@ -2911,7 +2911,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * <code>capacity</code> and
    * <code>overflow-directory</code>, then pass these values to Bridge Server
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void startClientHaQueue(Attributes atts) {
     ClientHaQueueCreation clientHaQueue = new ClientHaQueueCreation();
@@ -3385,7 +3385,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
 
   /**
    * Do nothing
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void endClientHaQueue() {
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolver.java
index 40134e4..edf3c40 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolver.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Property resolver for resolving ${} like strings with system or Gemfire
  * properties in Cache.xml
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CacheXmlPropertyResolver implements PropertyResolver{
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
index 4878999..bb2a47c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Helper class for CacheXmlPropertyResolver. Helps in parsing ${...${}..}..${} strings.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CacheXmlPropertyResolverHelper {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
index 716b983..d69e23d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXmlVersion.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
  * "8_0" and "10.0" was older than "9.0".
  *
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 // TODO future - replace constants in CacheXml with this Enum completely
 public enum CacheXmlVersion {
@@ -76,7 +76,7 @@ public enum CacheXmlVersion {
    * 
    * @return the version
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getVersion() {
     return version;
@@ -87,7 +87,7 @@ public enum CacheXmlVersion {
    *
    * @return the schemaLocation if schema exists, otherwise null.
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getSchemaLocation() {
     return schemaLocation;
@@ -106,7 +106,7 @@ public enum CacheXmlVersion {
    * The DTD public id.
    * 
    * @return the publicId if DTD exists, otherwise null.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getPublicId() {
     return publicId;
@@ -116,7 +116,7 @@ public enum CacheXmlVersion {
    * The DTD system id.
    * 
    * @return the systemId if DTD exists, otherwise null.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public String getSystemId() {
     return systemId;
@@ -132,7 +132,7 @@ public enum CacheXmlVersion {
    * @return {@link CacheXmlVersion} if exists.
    * @throws IllegalArgumentException
    *           if version does not exist.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final CacheXmlVersion valueForVersion(final String version) {
     final CacheXmlVersion cacheXmlVersion = valuesForVersion.get(version);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientCacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientCacheCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientCacheCreation.java
index e8a9479..59e897c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientCacheCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientCacheCreation.java
@@ -57,7 +57,7 @@ import java.util.Set;
  * public for testing purposes.
  *
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 @SuppressWarnings("deprecation")
 public class ClientCacheCreation extends CacheCreation implements ClientCache {
@@ -74,7 +74,7 @@ public class ClientCacheCreation extends CacheCreation implements ClientCache {
   /**
    * @param forParsing if true then this creation is used for parsing xml;
    *   if false then it is used for generating xml.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public ClientCacheCreation(boolean forParsing) {
     super(forParsing);
@@ -108,14 +108,14 @@ public class ClientCacheCreation extends CacheCreation implements ClientCache {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> ClientRegionFactory<K,V> createClientRegionFactory(ClientRegionShortcut atts) {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
 
   /**
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public <K,V> ClientRegionFactory<K,V> createClientRegionFactory(String regionAttributesId) {
     throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientHaQueueCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientHaQueueCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientHaQueueCreation.java
index be46693..0ea333e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientHaQueueCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ClientHaQueueCreation.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * client subscription. It encapsulates eviction policy, capacity and overflowDirectory.
  * This object will get created for every <b>client-subscription</b> tag
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ClientHaQueueCreation {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/Declarable2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/Declarable2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/Declarable2.java
index 5ffd9da..0c15117 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/Declarable2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/Declarable2.java
@@ -26,7 +26,7 @@ import java.util.Properties;
  * into XML.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface Declarable2 extends Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
index 6cac4c7..6fed567 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DefaultEntityResolver2.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.ClassPathLoader;
  * Default behavior for EntityResolver2 implementations.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 // UnitTest PivotalEntityResolverJUnitTest
 abstract public class DefaultEntityResolver2 implements EntityResolver2 {
@@ -56,7 +56,7 @@ abstract public class DefaultEntityResolver2 implements EntityResolver2 {
    * @param path
    *          to resource to get {@link InputSource} for.
    * @return InputSource if resource found, otherwise null.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   protected final InputSource getClassPathInputSource(final String publicId, final String systemId, final String path) {
     final InputStream stream = ClassPathLoader.getLatest().getResourceAsStream(getClass(), path);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation.java
index bb4d248..bc22c9c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/DiskStoreAttributesCreation.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * modified.  This class is public for testing purposes.
  *
  *
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  */
 public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttributes  implements Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
index d7c2a72..f3c1525 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/GeodeEntityResolver.java
@@ -33,7 +33,7 @@ import org.xml.sax.ext.EntityResolver2;
  * <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code>
  * 
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class GeodeEntityResolver extends DefaultEntityResolver2 {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
index 9c7e1f0..9017f92 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PivotalEntityResolver.java
@@ -33,7 +33,7 @@ import org.xml.sax.ext.EntityResolver2;
  * <code>META-INF/services/org.xml.sax.ext.EntityResolver2</code>
  * 
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class PivotalEntityResolver extends DefaultEntityResolver2 {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PropertyResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PropertyResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PropertyResolver.java
index 8d21d71..0578e32 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PropertyResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/PropertyResolver.java
@@ -23,7 +23,7 @@ import java.util.IllegalFormatException;
 import java.util.Properties;
 
 /**
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface PropertyResolver {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
index 4dfe6ae..243d8c5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * modified.  This class is public for testing purposes.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class RegionAttributesCreation extends UserSpecifiedRegionAttributes implements Serializable {
   private static final long serialVersionUID = 2241078661206355376L;
@@ -119,7 +119,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   private File[] diskDirs;
   private int[] diskSizes;
   /** disk store name of the region
-  * @since prPersistPrint2 
+  * @since GemFire prPersistPrint2
   * */
   private String diskStoreName;
   private boolean isDiskSynchronous = AttributesFactory.DEFAULT_DISK_SYNCHRONOUS;
@@ -131,12 +131,12 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   private boolean indexMaintenanceSynchronous;
   /** The attributes's id
    *
-   * @since 4.1 */
+   * @since GemFire 4.1 */
   private String id;
 
   /** The id of the attributes that this attributes "inherits"
    *
-   * @since 4.1 */
+   * @since GemFire 4.1 */
   private String refid;
 
   /** The partitioning attributes */
@@ -150,41 +150,41 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   /**
    * Whether to mark this region as a publisher
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   private boolean publisher;
 
   /**
    * Whether to enable subscription conflation for this region
    *
-   * @since 4.2
+   * @since GemFire 4.2
    */
   private boolean enableSubscriptionConflation;
 
   /**
    * Whether to enable a async conflation for this region
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   private boolean enableAsyncConflation;
   
   /**
    * The client to server Connection Pool
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private String poolName;
   
   /**
    * The region compressor.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   private Compressor compressor;
   
   /**
    * True if usage of off-heap memory is enabled for this region.
-   * @since 9.0
+   * @since Geode 1.0
    */
   private boolean offHeap;
 
@@ -994,7 +994,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   /**
    * Sets the id of the region attributes being created
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void setId(String id) {
     this.id = id;
@@ -1003,7 +1003,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   /**
    * Returns the id of the region attributes being created
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public String getId() {
     return this.id;
@@ -1012,7 +1012,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   /**
    * Sets the refid of the region attributes being created
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void setRefid(String refid) {
     this.refid = refid;
@@ -1021,7 +1021,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
   /**
    * Returns the refid of the region attributes being created
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public String getRefid() {
     return this.refid;
@@ -1037,7 +1037,7 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
    * @throws IllegalStateException
    *         If no region attributes named <code>refid</code> exist.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   void inheritAttributes(Cache cache) {
     inheritAttributes(cache, true);
@@ -1503,12 +1503,12 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes impl
     setHasMembershipAttributes(true);
   }
 
-  /** @since 5.0 */
+  /** @since GemFire 5.0 */
   public SubscriptionAttributes getSubscriptionAttributes() {
     return this.subscriptionAttributes;
   }
 
-  /** @since 5.0 */
+  /** @since GemFire 5.0 */
   public void setSubscriptionAttributes(SubscriptionAttributes pa) {
     this.subscriptionAttributes = pa;
     setHasSubscriptionAttributes(true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreation.java
index e26ab57..9d8e3f0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/RegionCreation.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * public for testing purposes.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class RegionCreation implements Region, Extensible<Region<?,?>> {
 
@@ -79,12 +79,12 @@ public class RegionCreation implements Region, Extensible<Region<?,?>> {
 
   /** The id of the region-attributes this regions uses by default.
    *
-   * @since 6.5 */
+   * @since GemFire 6.5 */
   private String refid;
 
   /**
    * If true then someone explicitly added region attributes to this region
-   * @since 6.5
+   * @since GemFire 6.5
    */
   private boolean hasAttributes;
 
@@ -110,7 +110,7 @@ public class RegionCreation implements Region, Extensible<Region<?,?>> {
   /**
    * {@link ExtensionPoint} to {@link Region}.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private final SimpleExtensionPoint<Region<?, ?>> extensionPoint = new SimpleExtensionPoint<Region<?,?>>(this, this);
 
@@ -925,7 +925,7 @@ public class RegionCreation implements Region, Extensible<Region<?,?>> {
   /**
    * Sets the refid of the region attributes being created
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setRefid(String refid) {
     this.refid = refid;
@@ -934,7 +934,7 @@ public class RegionCreation implements Region, Extensible<Region<?,?>> {
   /**
    * Returns the refid of the region attributes being created
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public String getRefid() {
     return this.refid;
@@ -961,7 +961,7 @@ public class RegionCreation implements Region, Extensible<Region<?,?>> {
   }
   
   /**
-   * @since 8.1
+   * @since GemFire 8.1
    */
   @Override
   public ExtensionPoint<Region<?, ?>> getExtensionPoint() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ResourceManagerCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ResourceManagerCreation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ResourceManagerCreation.java
index 3f9036b..4ad9b1f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ResourceManagerCreation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/ResourceManagerCreation.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.control.ResourceManager;
 import com.gemstone.gemfire.internal.cache.control.MemoryThresholds;
 
 /**
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class ResourceManagerCreation implements ResourceManager {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGenerator.java
index b1fb0fc..8c53972 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGenerator.java
@@ -25,7 +25,7 @@ import org.xml.sax.SAXException;
  * {@link #getNamspaceUri()} .
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public interface XmlGenerator<T> {
 
@@ -33,7 +33,7 @@ public interface XmlGenerator<T> {
    * Get XML Namespace this parser is responsible for.
    * 
    * @return XML Namespace.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   String getNamspaceUri();
 
@@ -43,7 +43,7 @@ public interface XmlGenerator<T> {
   // *
   // * @param logWriter
   // * current XML config {@link LogWriter}.
-  // * @since 8.1
+  // * @since GemFire 8.1
   // */
   // void setLogWriter(LogWriterI18n logWriter);
   //
@@ -54,7 +54,7 @@ public interface XmlGenerator<T> {
    * @param cacheXmlGenerator
    *          to generate configuration to.
    * @throws SAXException
-   * @since 8.1
+   * @since GemFire 8.1
    */
   void generate(CacheXmlGenerator cacheXmlGenerator) throws SAXException;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtils.java
index 3069730..42d89c9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlGeneratorUtils.java
@@ -29,7 +29,7 @@ import org.xml.sax.helpers.AttributesImpl;
  * helper methods.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 // UnitTest XmlGeneratorUtilsTest
 public final class XmlGeneratorUtils {
@@ -50,7 +50,7 @@ public final class XmlGeneratorUtils {
    *          of attribute to add.
    * @param value
    *          to add to attribute.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static public void addAttribute(final AttributesImpl attributes, final String localName, final Object value) {
     if (null != value) {
@@ -72,7 +72,7 @@ public final class XmlGeneratorUtils {
    *          of attribute to add.
    * @param value
    *          to add to attribute.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static public void addAttribute(final AttributesImpl attributes, final String prefix, final String localName, final Object value) {
     if (null != value) {
@@ -96,7 +96,7 @@ public final class XmlGeneratorUtils {
    *           if
    *           {@link ContentHandler#startElement(String, String, String, Attributes)}
    *           throws {@link SAXException}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static public void startElement(final ContentHandler contentHandler, final String prefix, final String localName, final AttributesImpl attributes)
       throws SAXException {
@@ -116,7 +116,7 @@ public final class XmlGeneratorUtils {
    * @throws SAXException
    *           if {@link ContentHandler#endElement(String, String, String)}
    *           throws {@link SAXException}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static public void endElement(final ContentHandler contentHandler, final String prefix, final String localName) throws SAXException {
     contentHandler.endElement(XMLConstants.NULL_NS_URI, localName, prefix + ":" + localName);
@@ -139,7 +139,7 @@ public final class XmlGeneratorUtils {
    *           {@link ContentHandler#startElement(String, String, String, Attributes)}
    *           or {@link ContentHandler#endElement(String, String, String)}
    *           throws {@link SAXException}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   static public void emptyElement(final ContentHandler contentHandler, final String prefix, final String localName, final AttributesImpl attributes)
       throws SAXException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlParser.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlParser.java
index 9d601fa..27cfa5a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/XmlParser.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
  * <code>META-INF/services/com.gemstone.gemfire.internal.cache.xmlcache.XmlParser</code>
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public interface XmlParser extends ContentHandler {
 
@@ -42,7 +42,7 @@ public interface XmlParser extends ContentHandler {
    * Get XML Namespace this parser is responsible for.
    * 
    * @return XML Namespace.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   String getNamspaceUri();
 
@@ -51,7 +51,7 @@ public interface XmlParser extends ContentHandler {
    * 
    * @param stack
    *          current XML config stack.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   void setStack(Stack<Object> stack);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/package.html
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/package.html b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/package.html
index 3ae3d93..3d577bf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/package.html
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/package.html
@@ -26,7 +26,7 @@ com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator
 generator} XML from an existing {@link
 com.gemstone.gemfire.cache.Cache Cache}.
 
-@since 2.0 (rewritten in 3.0)
+@since GemFire 2.0 (rewritten in 3.0)
 
 </BODY>
 </HTML>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
index 549c04e..8940dc2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/CompactConcurrentHashSet2.java
@@ -68,7 +68,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * thread safety but not on its synchronization details.
  *
  *
- * @since 9.0
+ * @since Geode 1.0
  * @author Originally Doug Lea
  * @param <V> the type of values held in the set
  */
@@ -659,7 +659,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      * @throws IllegalArgumentException if the initial capacity of
      * elements is negative or the load factor is nonpositive
      *
-     * @since 9.0
+     * @since Geode 1.0
      */
     public CompactConcurrentHashSet2(int initialCapacity, float loadFactor) {
         this(initialCapacity, loadFactor, 1);
@@ -1154,7 +1154,7 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      * there are concurrent insertions or removals.
      *
      * @return the number of mappings
-     * @since 9.0
+     * @since Geode 1.0
      */
     public long mappingCount() {
         long n = sumCount();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapCallback.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapCallback.java
index 8aa3bf8..e60d157 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapCallback.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapCallback.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap;
  * <p>
  * Now also has a bunch of callbacks including for replace/remove etc.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  * @param <K>
  *          the type of key of the map

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapResult.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapResult.java
index 6a041d1..ff99018 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/concurrent/MapResult.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.concurrent;
  * Any additional result state needed to be passed to {@link MapCallback} which
  * returns values by reference.
  * 
- * @since Helios
+ * @since GemFire Helios
  */
 public interface MapResult {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/AbstractStringIdResourceBundle.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/AbstractStringIdResourceBundle.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/AbstractStringIdResourceBundle.java
index 18b2022..5b2a2d8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/AbstractStringIdResourceBundle.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/AbstractStringIdResourceBundle.java
@@ -34,7 +34,7 @@ import java.util.Locale;
  * Baseclass for all {@link StringId} based ResourceBundles
  * @see java.util.ResourceBundle 
  *
- * @since 5.7 
+ * @since GemFire 5.7
  */
 public class AbstractStringIdResourceBundle {
   private Int2ObjectOpenHashMap data;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index d3d232e..954d2c8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * }
  * </code>
  *
- * @since 6.0
+ * @since GemFire 6.0
  *
  */
 public class LocalizedStrings {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
index c34c91a..a7d2a87 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * about the implicit static initializer for all these static final constants
  * being greater than 65535.
  *   
- * @since 7.0
+ * @since GemFire 7.0
  */
 class ParentLocalizedStrings {
   /** reserved space for commonly used strings, messageId 0-1024 **/

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/StringId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/StringId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/StringId.java
index 6b8f383..e832f1a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/StringId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/StringId.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.i18n;
 /**
  * This class forms the basis of the i18n strategy. Its primary function is to
  * be used as a key to be passed to an instance of StringIdResourceBundle.
- * @since 6.0 
+ * @since GemFire 6.0
  */
 public interface StringId {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositeOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositeOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositeOutputStream.java
index 5fbf162..6443466 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositeOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositeOutputStream.java
@@ -26,7 +26,7 @@ import java.util.Set;
 /**
  * Delegates all operations to a collection of OutputStreams.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CompositeOutputStream extends OutputStream implements Iterable<OutputStream> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositePrintStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositePrintStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositePrintStream.java
index cdd2eae..b940ffb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositePrintStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/CompositePrintStream.java
@@ -21,7 +21,7 @@ import java.io.PrintStream;
 import java.util.Iterator;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CompositePrintStream extends PrintStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeeOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeeOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeeOutputStream.java
index 6d7229c..b01ba1a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeeOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeeOutputStream.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
  * Delegates all operations to the original underlying OutputStream and a
  * mutable branch OutputStream.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TeeOutputStream extends FilterOutputStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeePrintStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeePrintStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeePrintStream.java
index 76dc6b8..ab94710 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeePrintStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/io/TeePrintStream.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.io;
 import java.io.PrintStream;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TeePrintStream extends PrintStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
index 16bdf04..78c8f5c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/GlobalTransaction.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.jta;
  * </p>
  * 
  * 
- * @since 4.0 
+ * @since GemFire 4.0
  */
 import com.gemstone.gemfire.i18n.LogWriterI18n;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/TransactionManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/TransactionManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/TransactionManagerImpl.java
index d7b4217..c82d36d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/TransactionManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/TransactionManagerImpl.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.jta;
  * TransactionManager: A JTA compatible Transaction Manager.
  * </p>
  * 
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 import java.io.Serializable;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/UserTransactionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/UserTransactionImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/UserTransactionImpl.java
index eacbd09..a784f00 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/UserTransactionImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/UserTransactionImpl.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.internal.jta;
  * </p>
  * 
  * 
- * @since 4.0
+ * @since GemFire 4.0
  */
 import java.io.Serializable;
 import javax.transaction.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/XidImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/XidImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/XidImpl.java
index a8bc96e..d8ab005 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/XidImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/jta/XidImpl.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.jta;
  * XidImpl: A JTA compatible implementation of Xid
  * </p>
  * 
- * @since 4.0 
+ * @since GemFire 4.0
  */
 import javax.transaction.xa.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ClassUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ClassUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ClassUtils.java
index 5342b24..766af6b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ClassUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ClassUtils.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.lang;
  * <p/>
  * @see java.lang.Class
  * @see java.lang.Object
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class ClassUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Filter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Filter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Filter.java
index c886e71..a2460c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Filter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Filter.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.lang;
 /**
  * The Filter interface defines a contract for implementing objects that act as a filter to segregate other objects.
  * </p>
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface Filter<T> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/InOutParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/InOutParameter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/InOutParameter.java
index 906bdf0..5d86fbc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/InOutParameter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/InOutParameter.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.lang;
  * as it's value, as determined by the equals method and so this class just serves as a kind of holder for it's value.
  * <p/>
  * @param <T> the expected Class type of the parameter's value.
- * @since 6.8
+ * @since GemFire 6.8
  */
 public class InOutParameter<T> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initable.java
index 05ccf35..d9d5c1a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initable.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.lang;
  * The Initable interface defines a contract for implementing classes who's Object instances can be initialized after
  * construction.
  * <p/>
- * @since 6.8
+ * @since GemFire 6.8
  */
 public interface Initable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initializer.java
index 14298fd..2d9d041 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Initializer.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.lang;
  * init method.
  * <p/>
  * @see com.gemstone.gemfire.internal.lang.Initable
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class Initializer {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/MutableIdentifiable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/MutableIdentifiable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/MutableIdentifiable.java
index 460274e..abe03bd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/MutableIdentifiable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/MutableIdentifiable.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.lang.Identifiable;
  * <p/>
  * @param <T> the class type of the identifier.
  * @see java.lang.Comparable
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface MutableIdentifiable<T>  extends Identifiable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ObjectUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ObjectUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ObjectUtils.java
index 4994792..677a231 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ObjectUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ObjectUtils.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
  * The ObjectUtils class is an abstract utility class for working with and invoking methods on Objects.
  * <p/>
  * @see java.lang.Object
- * @since 6.8
+ * @since GemFire 6.8
  */
 @SuppressWarnings("unused")
 public abstract class ObjectUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Orderable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Orderable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Orderable.java
index 2cefbd4..5c56ecc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Orderable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Orderable.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.lang;
  * order property of a Comparable type.
  * <p/>
  * @see java.lang.Comparable
- * @since 6.8
+ * @since GemFire 6.8
  */
 public interface Orderable<T extends Comparable<T>> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Ordered.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Ordered.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Ordered.java
index d52f325..97fb6b3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Ordered.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/Ordered.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.lang;
  * of ordered data structure, such as an array or List, or exist in a context where order relative to other
  * peer instances matter.
  * <p/>
- * @since 6.8
+ * @since GemFire 6.8
  */
 public interface Ordered {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/StringUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/StringUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/StringUtils.java
index bffd398..a153103 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/StringUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/StringUtils.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.Token;
  * The StringUtils is an abstract utility class for working with and invoking operations on String literals.
  * <p/>
  * @see java.lang.String
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public abstract class StringUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/SystemUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/SystemUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/SystemUtils.java
index f58446d..1c52a10 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/SystemUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/SystemUtils.java
@@ -27,7 +27,7 @@ import java.util.StringTokenizer;
  * of the Java System class.
  * 
  * @see java.lang.System
- * @since 6.8
+ * @since GemFire 6.8
  */
 @SuppressWarnings("unused")
 public class SystemUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ThreadUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ThreadUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ThreadUtils.java
index e4688d0..a712f69 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ThreadUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/lang/ThreadUtils.java
@@ -26,7 +26,7 @@ import java.lang.Thread.State;
  * The ThreadUtils class is an abstract utility class for working with and invoking methods on Threads.
  * <p/>
  * @see java.lang.Thread
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class ThreadUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/DebugLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/DebugLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/DebugLogWriter.java
index 6446e4c..c10beaf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/DebugLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/DebugLogWriter.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.i18n.StringId;
  *  }
  *  </pre>
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 final public class DebugLogWriter extends LogWriterImpl
 {
@@ -66,7 +66,7 @@ final public class DebugLogWriter extends LogWriterImpl
    * Handles internationalized log messages.
    * @param params each Object has toString() called and substituted into the msg
    * @see com.gemstone.gemfire.i18n.StringId
-   * @since 6.0 
+   * @since GemFire 6.0
    */
   @Override
   public void put(int msgLevel, StringId msgId, Object[] params, Throwable exception)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LocalLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LocalLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LocalLogWriter.java
index 34dc53d..74dda61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LocalLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LocalLogWriter.java
@@ -86,7 +86,7 @@ public class LocalLogWriter extends PureLogWriter {
      *
      * @throws IllegalArgumentException if level is not in legal range
      *
-     * @since 3.5
+     * @since GemFire 3.5
      */
     public LocalLogWriter(int level, PrintWriter logWriter,
                           String connectionName) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogFileParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogFileParser.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogFileParser.java
index aa00da4..a431b28 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogFileParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogFileParser.java
@@ -29,7 +29,7 @@ import java.util.*;
  * java.util.StringTokenizer}. 
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class LogFileParser  {
   private static final boolean TRIM_TIMESTAMPS = Boolean.getBoolean("mergelogs.TRIM_TIMESTAMPS");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterImpl.java
index 19be256..d55fc6f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterImpl.java
@@ -305,7 +305,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object[] params, Throwable ex) {
       if (this.severeEnabled()) {
@@ -315,7 +315,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object param, Throwable ex) {
       if (this.severeEnabled()) {
@@ -325,7 +325,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Throwable ex) {
       severe(msgID, null, ex);
@@ -333,7 +333,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object[] params) {
       severe(msgID, params, null);
@@ -341,7 +341,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object param) {
       severe(msgID, param, null);
@@ -349,7 +349,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID) {
       severe(msgID, null, null);
@@ -386,7 +386,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object[] params, Throwable ex) {
       if (this.errorEnabled()) {
@@ -396,7 +396,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object param, Throwable ex) {
       if (this.errorEnabled()) {
@@ -406,7 +406,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Throwable ex) {
       error(msgID, null, ex); 
@@ -414,7 +414,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object[] params) {
       error(msgID, params, null); 
@@ -422,7 +422,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object param) {
       error(msgID, param, null); 
@@ -430,7 +430,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID) {
       error(msgID, null, null); 
@@ -467,7 +467,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object[] params, Throwable ex) {
       if (this.warningEnabled()) {
@@ -477,7 +477,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object param, Throwable ex) {
       if (this.warningEnabled()) {
@@ -487,7 +487,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Throwable ex) {
       warning(msgID, null, ex);
@@ -495,7 +495,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object[] params) {
       warning(msgID, params, null);
@@ -503,7 +503,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object param) {
       warning(msgID, param, null);
@@ -511,7 +511,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID) {
       warning(msgID, null, null);
@@ -549,7 +549,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object[] params, Throwable ex) {
       if (this.infoEnabled()) {
@@ -559,7 +559,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object param, Throwable ex) {
       if (this.infoEnabled()) {
@@ -569,7 +569,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Throwable ex) {
       info(msgID, null, ex); 
@@ -577,7 +577,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object[] params) {
       info(msgID, params, null); 
@@ -585,7 +585,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object param) {
       info(msgID, param, null); 
@@ -593,7 +593,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID) {
       info(msgID, null, null); 
@@ -630,7 +630,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object[] params, Throwable ex) {
       if (this.configEnabled()) {
@@ -640,7 +640,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object param, Throwable ex) {
       if (this.configEnabled()) {
@@ -650,7 +650,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Throwable ex) {
       config(msgID, null, ex);
@@ -658,7 +658,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object[] params) {
       config(msgID, params, null);
@@ -666,7 +666,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object param) {
       config(msgID, param, null);
@@ -674,7 +674,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID) {
       config(msgID, null, null);
@@ -821,7 +821,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
      * If a startup listener is registered,
      * the message will be written to the listener as well
      * to be reported to a user.
-     * @since 7.0
+     * @since GemFire 7.0
      */
     public void startup(StringId msgID, Object[] params) {
       String message = msgID.toLocalizedString(params);
@@ -1027,7 +1027,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
 
   /*
    * @see com.gemstone.gemfire.LogWriter
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public com.gemstone.gemfire.LogWriter convertToLogWriter() {
     return this;
@@ -1035,7 +1035,7 @@ public abstract class LogWriterImpl implements InternalLogWriter {
   
   /*
    * @see com.gemstone.gemfire.LogWriterI18n
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public LogWriterI18n convertToLogWriterI18n() {
     return this;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
index 48c0eac..82f487f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LoggingThreadGroup.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.i18n.StringId;
  *
  * @see LoggingThreadGroup#createThreadGroup
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class LoggingThreadGroup extends ThreadGroup {
 
@@ -73,7 +73,7 @@ public class LoggingThreadGroup extends ThreadGroup {
    *        is okay for this argument to be <code>null</code>.
    *
    * author David Whitlock
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public static LoggingThreadGroup createThreadGroup(final String name,
                                                      final InternalLogWriter logWriter) {
@@ -128,7 +128,7 @@ public class LoggingThreadGroup extends ThreadGroup {
    *        is okay for this argument to be <code>null</code>.
    *
    * author David Whitlock
-   * @since 3.0
+   * @since GemFire 3.0
    */
   public static LoggingThreadGroup createThreadGroup(final String name,
                                                      final Logger logger) {
@@ -184,7 +184,7 @@ public class LoggingThreadGroup extends ThreadGroup {
 //   *        is okay for this argument to be <code>null</code>.
 //   *
 //   * author kbanks 
-//   * @since 6.0
+//   * @since GemFire 6.0
 //   */
 //  @Deprecated public static LoggingThreadGroup createThreadGroup(final String name,
 //                                                                 final LogWriter logger) {
@@ -334,7 +334,7 @@ public class LoggingThreadGroup extends ThreadGroup {
   /**
    * clean up the threadgroup, releasing resources that could be problematic
    * (bug 35388)
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public synchronized void cleanup() {
     // the logwriter holds onto a distribution config, which holds onto

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
index 28419fc..b4e32c0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/ManagerLogWriter.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.util.LogFileUtils;
   * Its just like {@link LocalLogWriter} except it has support for rolling
   * and alerts. 
   *
-  * @since 1.0
+  * @since Geode 1.0
   */
 public class ManagerLogWriter extends LocalLogWriter  {
 
@@ -75,7 +75,7 @@ public class ManagerLogWriter extends LocalLogWriter  {
      *
      * @throws IllegalArgumentException if level is not in legal range
      *
-     * @since 3.5
+     * @since GemFire 3.5
      */
     public ManagerLogWriter(int level, PrintStream out,
                             String connectionName) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/MergeLogFiles.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/MergeLogFiles.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/MergeLogFiles.java
index bdad145..2ab0a3e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/MergeLogFiles.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/MergeLogFiles.java
@@ -96,7 +96,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  *
  *
  *
- * @since 2.0 (-pids, -threads, -align, and -noblanks added in 5.1)
+ * @since GemFire 2.0 (-pids, -threads, -align, and -noblanks added in 5.1)
  */
 public class MergeLogFiles {
   private static PrintStream out = System.out;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLocalLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLocalLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLocalLogWriter.java
index 44f6e57..aeab7c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLocalLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLocalLogWriter.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * Implementation of {@link com.gemstone.gemfire.LogWriter} that will write
  * security related logs to a local stream.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class SecurityLocalLogWriter extends PureLogWriter {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionInDoubtException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionInDoubtException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionInDoubtException.java
index 49adffd..7718b0c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionInDoubtException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionInDoubtException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache;
 /**
  * This Exception is thrown in presence of node failures, when GemFire cannot
  * know with certainty about the outcome of the transaction.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class TransactionInDoubtException extends TransactionException {
   private static final long serialVersionUID = 4895453685211922512L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionListener.java
index 0ce2f62..9cbc5f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionListener.java
@@ -36,7 +36,7 @@ package com.gemstone.gemfire.cache;
  *
  * @see CacheTransactionManager#setListener
  * @see CacheTransactionManager#getListener
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public interface TransactionListener extends CacheCallback {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriter.java
index 18584a7..848b39b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriter.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache;
  * This writer can be used to update a backend data source before the GemFire cache is updated during commit.
  * If the backend update fails, the implementer can throw a {@link TransactionWriterException} to veto the transaction.
  * @see CacheTransactionManager#setWriter
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public interface TransactionWriter extends CacheCallback {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriterException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriterException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriterException.java
index efee741..0a0b182 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriterException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionWriterException.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache;
  * signal that the current transaction should be aborted.
  * 
  * @see TransactionWriter#beforeCommit
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public class TransactionWriterException extends Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedOperationInTransactionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedOperationInTransactionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedOperationInTransactionException.java
index a91b822..d460d12 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedOperationInTransactionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedOperationInTransactionException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache;
  * Indicates that an attempt was mode to invoke an operation that is not
  * allowed in a transaction.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class UnsupportedOperationInTransactionException extends
     UnsupportedOperationException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedVersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedVersionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedVersionException.java
index 7485b03..29cde1b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedVersionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/UnsupportedVersionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache;
 /**
  * An <code>UnsupportedVersionException</code> indicates an unsupported version.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class UnsupportedVersionException extends VersionException {
 private static final long serialVersionUID = 1152280300663399399L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/VersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/VersionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/VersionException.java
index 4496ccc..59208cc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/VersionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/VersionException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  * An <code>VersionException</code> is an exception that indicates
  * a client / server version mismatch exception has occurred.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public abstract class VersionException extends GemFireCheckedException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEvent.java
index 054c50b..9e05334 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEvent.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.wan.GatewayQueueEvent;
 /**
  * Represents <code>Cache</code> events delivered to <code>AsyncEventListener</code>.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface AsyncEvent<K, V> extends GatewayQueueEvent<K, V>{
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventListener.java
index db49025..b8661b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventListener.java
@@ -56,7 +56,7 @@ import com.gemstone.gemfire.cache.CacheCallback;
  * }
  * </pre>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface AsyncEventListener extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueue.java
index c2d04a1..edf887b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueue.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
  * Interface of AsyncEventQueue. 
  * This represents the channel over which the events are delivered to the <code>AsyncEventListener</code>. 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface AsyncEventQueue {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
index c607142..6294dfe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueFactory.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
   AsyncEventQueue asyncQueue = factory.create(asyncQueueId, asyncEventListener);
 </PRE>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface AsyncEventQueueFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/AllConnectionsInUseException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/AllConnectionsInUseException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/AllConnectionsInUseException.java
index b397327..d294ba0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/AllConnectionsInUseException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/AllConnectionsInUseException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.client;
 /**
  * Indicates that the connection pool is at its maximum size and
  * all connections are in use.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class AllConnectionsInUseException extends ServerConnectivityException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
index 707575d..b00d1a2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
  * is used by {@link Region}s (created using {@link ClientRegionFactory}) to talk to
  * regions on the server.
  * <p>More pools can be created using {@link PoolManager} or by declaring them in cache.xml.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface ClientCache extends GemFireCache {
   /**
@@ -152,14 +152,14 @@ public interface ClientCache extends GemFireCache {
   
   /**
    * Returns a set of the servers to which this client is currently connected.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Set<InetSocketAddress> getCurrentServers();
   
   /**
    * Returns the default server pool. If one or more non-default pools were
    * configured, this may return null.
-   * @since 7.0
+   * @since GemFire 7.0
    * @see com.gemstone.gemfire.cache.client.Pool
    */
   public Pool getDefaultPool();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
index 49efff1..5b035a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
@@ -114,7 +114,7 @@ Now, create the data region in the client cache using this new attributes ID.
     .create();
   Region r = c.createClientRegionFactory("MYAPP_CACHING_PROXY_MEM_LRU").create("customers");
 </PRE>
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ClientCacheFactory {
 
@@ -638,7 +638,7 @@ public class ClientCacheFactory {
    * 
    *  @param pdxReadSerialized true to prefer PdxInstance
    *  @return this ClientCacheFactory
-   *  @since 6.6
+   *  @since GemFire 6.6
    *  @see com.gemstone.gemfire.pdx.PdxInstance 
    */
   public ClientCacheFactory setPdxReadSerialized(boolean pdxReadSerialized) {
@@ -652,7 +652,7 @@ public class ClientCacheFactory {
    * added to the cache in portable data exchange format. 
    * @param serializer the serializer to use
    * @return this ClientCacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    * @see PdxSerializer
    */
   public ClientCacheFactory setPdxSerializer(PdxSerializer serializer) {
@@ -670,7 +670,7 @@ public class ClientCacheFactory {
    * @param diskStoreName the name of the disk store to use
    * for the PDX metadata.
    * @return this ClientCacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public ClientCacheFactory setPdxDiskStore(String diskStoreName) {
     this.cacheConfig.setPdxDiskStore(diskStoreName);
@@ -685,7 +685,7 @@ public class ClientCacheFactory {
    * 
    * @param isPersistent true if the metadata should be persistent
    * @return this ClientCacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public ClientCacheFactory setPdxPersistent(boolean isPersistent) {
     this.cacheConfig.setPdxPersistent(isPersistent);
@@ -703,7 +703,7 @@ public class ClientCacheFactory {
    * @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 ClientCacheFactory
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public ClientCacheFactory 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/client/ClientNotReadyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientNotReadyException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientNotReadyException.java
index 0ad9036..eebc36f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientNotReadyException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientNotReadyException.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.OperationAbortedException;
  * <p>This exception was moved from the <code>util</code> package in 5.7.
  * 
  *
- * @since 5.7
+ * @since GemFire 5.7
  * @deprecated as of 6.5 this exception is no longer thrown by GemFire so any code that catches it should be removed.
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionFactory.java
index fc68a99..3141d47 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionFactory.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.compression.Compressor;
  *     myListener).create(&quot;customers&quot;);
  * </PRE>
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public interface ClientRegionFactory<K,V> {
@@ -236,7 +236,7 @@ public interface ClientRegionFactory<K,V> {
 
   /**
    * Enables or disabled concurrent modification checks
-   * @since 7.0
+   * @since GemFire 7.0
    * @param concurrencyChecksEnabled whether to perform concurrency checks on operations
    */
   public void setConcurrencyChecksEnabled(boolean concurrencyChecksEnabled);
@@ -300,7 +300,7 @@ public interface ClientRegionFactory<K,V> {
    * region entry values.
    * @param compressor a compressor
    * @return a reference to this RegionFactory instance
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public ClientRegionFactory<K,V> setCompressor(Compressor compressor);
   
@@ -338,7 +338,7 @@ public interface ClientRegionFactory<K,V> {
    *           if the parent region has been closed or destroyed
    * @throws CacheClosedException
    *           if the cache is closed
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public Region<K,V> createSubregion(Region<?,?> parent, String name) throws RegionExistsException;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionShortcut.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionShortcut.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionShortcut.java
index 3b7c3bf..cb04d74 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionShortcut.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientRegionShortcut.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.*;
  * <p>Another way to use predefined region attributes is in cache.xml by setting
  * the refid attribute on a region element or region-attributes element to the
  * string of each value.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public enum ClientRegionShortcut {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableLocatorsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableLocatorsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableLocatorsException.java
index 4157777..0967a8c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableLocatorsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableLocatorsException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.client;
 
 /**
  * An exception indicating that there are no active locators available to connect to.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class NoAvailableLocatorsException extends ServerConnectivityException {
   private static final long serialVersionUID = -8212446737778234890L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableServersException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableServersException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableServersException.java
index e848921..0c3f0e5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableServersException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/NoAvailableServersException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache.client;
 
 /**
  * An exception indicating that there are no active servers available to connect to.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class NoAvailableServersException extends ServerConnectivityException {
   private static final long serialVersionUID = -8212446737778234890L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/Pool.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/Pool.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/Pool.java
index 233f833..14f20ab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/Pool.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/Pool.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
  * on the client regions that will use this pool by calling
  * {@link RegionFactory#setPoolName}.
  *
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface Pool {
@@ -122,7 +122,7 @@ public interface Pool {
   /**
    * Returns true if single-hop optimisation is enabled on this pool.
    * @see PoolFactory#setPRSingleHopEnabled
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean getPRSingleHopEnabled();
   /**
@@ -149,7 +149,7 @@ public interface Pool {
   /**
    * Returns true if multiuser mode is enabled on this pool.
    * @see PoolFactory#setMultiuserAuthentication(boolean)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean getMultiuserAuthentication();
 
@@ -243,7 +243,7 @@ public interface Pool {
    * @throws IllegalStateException
    *           If called by a non-durable client or if invoked any time after
    *           invocation of {@link ClientCache#readyForEvents()}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public int getPendingEventCount();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
index 0d89da2..4d9588b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolFactory.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.cache.query.*; // for javadocs
  * <li>{@link Region#registerInterestRegex(String, InterestResultPolicy, boolean)}
  * </ul>
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface PoolFactory {
   /**
@@ -166,13 +166,13 @@ public interface PoolFactory {
   /**
    * The default value for whether to have single hop optimisations enabled.
    * <p>Current value: <code>true</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final boolean DEFAULT_PR_SINGLE_HOP_ENABLED = true;
   /**
    * The default value for whether to use multiuser mode.
    * <p>Current value: <code>false</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */  
   public static final boolean DEFAULT_MULTIUSER_AUTHENTICATION = false;
   /**
@@ -452,7 +452,7 @@ public interface PoolFactory {
    * servers as they do not host any partitions.
    * 
    * @return a reference to <code>this</code>
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PoolFactory setPRSingleHopEnabled(boolean enabled);
 
@@ -469,7 +469,7 @@ public interface PoolFactory {
    * 
    * @return a reference to <code>this</code>
    * @see ClientCache#createAuthenticatedView(java.util.Properties)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PoolFactory setMultiuserAuthentication(boolean enabled);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolManager.java
index cf10780..de125a2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/PoolManager.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem; // for javadocs
  * <p>
  * To get rid of all created pool call {@link #close()}.
  *
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public final class PoolManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerConnectivityException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerConnectivityException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerConnectivityException.java
index c41ae86..545bfe0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerConnectivityException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerConnectivityException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireException;
  * A generic exception indicating that a failure has happened while communicating
  * with a gemfire server. Subclasses of this exception provide more detail
  * on specific failures.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerConnectivityException extends GemFireException {
 private static final long serialVersionUID = -5205644901262051330L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerOperationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerOperationException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerOperationException.java
index 72271c2..e18a8b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerOperationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerOperationException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 /**
  * An exception indicating that a failure has happened on the server
  * while processing an operation that was sent to it by a client.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerOperationException extends ServerConnectivityException {
 private static final long serialVersionUID = -3106323103325266219L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerRefusedConnectionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerRefusedConnectionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerRefusedConnectionException.java
index 4746371..363942d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerRefusedConnectionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ServerRefusedConnectionException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * to connect to a server, but the handshake was rejected.
  *
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerRefusedConnectionException extends OperationAbortedException {
 private static final long serialVersionUID = 1794959225832197946L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException.java
index c9ea06b..b099528 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.Region;
  * An exception indicating that client subscriptions are not enabled on this client, but
  * the client is trying to perform an operation that requires a client subscription,
  *  such as {@link Region#registerInterest(Object)}.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class SubscriptionNotEnabledException extends ServerConnectivityException {
   private static final long serialVersionUID = -8212446737778234890L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
index 28c1e0f..fca9295 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AbstractOp.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 /**
  * Represents an operation that can be performed in a client by sending
  * a message to a server.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public abstract class AbstractOp implements Op {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXEnumOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXEnumOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXEnumOp.java
index 8b522f1..5476b73 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXEnumOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXEnumOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
 
 /**
  * Push a PDX Enum id to other servers.
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class AddPDXEnumOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXTypeOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXTypeOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXTypeOp.java
index 9c3e8e1..835c15c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXTypeOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AddPDXTypeOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.pdx.internal.PdxType;
 
 /**
  * Add a PdxType to a server.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class AddPDXTypeOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
index 54957a2..135b7df 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * 
  * @see PutUserCredentials
  * @see ProxyCache
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class AuthenticateUserOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
index a70928b..985b4c3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * A connection source which uses locators to find
  * the least loaded server.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class AutoConnectionSourceImpl implements ConnectionSource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
index b7bff08..31550b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CacheServerLoadMessage.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.InternalDataSerializer;
  * with new load information from the server.
  * Also includes the id of any clients whose estimate is no
  * longer needed on the server-locator.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class CacheServerLoadMessage extends SerialDistributionMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClearOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClearOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClearOp.java
index c8fb08f..c576f85 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClearOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClearOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.EventID;
 
 /**
  * Does a region clear (or create) on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ClearOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientMetadataService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientMetadataService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientMetadataService.java
index 60318b0..8e05175 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientMetadataService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientMetadataService.java
@@ -52,7 +52,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * on which the data for the client operation is residing
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public final class ClientMetadataService {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientPartitionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientPartitionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientPartitionAdvisor.java
index 65b7575..6a42d46 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientPartitionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientPartitionAdvisor.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Stores the information such as partition attributes and meta data details
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public class ClientPartitionAdvisor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientRegionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientRegionFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientRegionFactoryImpl.java
index 942b829..bba2d75 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientRegionFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ClientRegionFactoryImpl.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.cache.UserSpecifiedRegionAttributes;
 /**
  * The distributed system will always default to a loner on a client.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 
 public class ClientRegionFactoryImpl<K,V> implements ClientRegionFactory<K,V>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseConnectionOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseConnectionOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseConnectionOp.java
index 36e08f5..c8990f4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseConnectionOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseConnectionOp.java
@@ -23,7 +23,7 @@ import java.io.EOFException;
 
 /**
  * Tell a server that a connection is being closed
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class CloseConnectionOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CommitOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CommitOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CommitOp.java
index 9ae684e..e694a49 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CommitOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/CommitOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Does a commit on a server
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CommitOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Connection.java
index 583c171..5037135 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Connection.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ServerQueueStatus;
 /**
  * Represents a connection from a client to a server.
  * Instances are created, kept, and used by {@link PoolImpl}.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface Connection {
   public static final long DEFAULT_CONNECTION_ID = 26739;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactory.java
index 62bbb36..248420f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactory.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
 
 /**
  * A factory for creating new connections.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface ConnectionFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
index 005b65a..6533b50 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionFactoryImpl.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
 /**
  * Creates connections, using a connection source to determine
  * which server to connect to.
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public class ConnectionFactoryImpl implements ConnectionFactory {
@@ -71,7 +71,7 @@ public class ConnectionFactoryImpl implements ConnectionFactory {
   
   /**
    * Test hook for client version support
-   * @since 5.7
+   * @since GemFire 5.7
    */
   
   public static boolean testFailedConnectionToServer = false;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
index c20b318..7a2308c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -52,7 +52,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * The execute  method of this class is synchronized to
  * prevent two ops from using the client to server connection
  *  at the same time.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class ConnectionImpl implements Connection {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionSource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionSource.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionSource.java
index b88e01a..4230f62 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionSource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionSource.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 /**
  * A source for discovering servers and finding the least loaded
  * server to connect to.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface ConnectionSource {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionStats.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionStats.java
index 7f15d47..4bd4439 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionStats.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.MessageStats;
 
 /**
  * Stats for a client to server {@link Connection}
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ConnectionStats implements MessageStats {
   // static fields 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ContainsKeyOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ContainsKeyOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ContainsKeyOp.java
index b75c7a3..6200f3e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ContainsKeyOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ContainsKeyOp.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Does a region containsKey on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ContainsKeyOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
index 6a3840a..e8ce1a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyOp.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region destroy on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class DestroyOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyRegionOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyRegionOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyRegionOp.java
index 6c51c07..fa13609 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyRegionOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DestroyRegionOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.EventID;
 
 /**
  * Does a region destroyRegion (or create) on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class DestroyRegionOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Endpoint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Endpoint.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Endpoint.java
index 7671aa7..0048244 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Endpoint.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Endpoint.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 
 /**
  * Represents a server. Keeps track of information about the specific server
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class Endpoint {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecutablePool.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecutablePool.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecutablePool.java
index 8480b91..aeea0b9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecutablePool.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecutablePool.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 
 /**
  * Provides methods to execute AbstractOp instances on a client pool.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface ExecutablePool {
   /**
@@ -32,7 +32,7 @@ public interface ExecutablePool {
    * It will only execute it once and on one server.
    * @param op the operation to execute
    * @return the result of execution if any; null if not
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object execute(Op op);
   
@@ -42,7 +42,7 @@ public interface ExecutablePool {
    * It will only execute it once and on one server.
    * @param op the operation to execute
    * @return the result of execution if any; null if not
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object execute(Op op, int retryAttempts);
   
@@ -67,7 +67,7 @@ public interface ExecutablePool {
    * @return The result from the primary server.
    * @throws NoSubscriptionServersAvailableException if we have no queue server
    * @throws SubscriptionNotEnabledException If the pool does not have queues enabled
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object executeOnQueuesAndReturnPrimaryResult(Op op)  throws NoSubscriptionServersAvailableException, SubscriptionNotEnabledException;
   /**
@@ -120,21 +120,21 @@ public interface ExecutablePool {
    * @param allowFailover true if we want to failover to another
    * server when the first server is unreachable. Affinity to the
    * new server will be maintained
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public void setupServerAffinity(boolean allowFailover);
   
   /**
    * Release the server affinity established
    * by {@link #setupServerAffinity(boolean)}
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public void releaseServerAffinity();
   
   /**
    * When server affinity is enabled by this thread, returns the server against which all ops in this thread are performed 
    * @return location of the affinity server
-   * @since 6.6
+   * @since GemFire 6.6
    * @see ExecutablePool#setupServerAffinity(boolean) 
    */
   public ServerLocation getServerAffinityLocation();
@@ -143,7 +143,7 @@ public interface ExecutablePool {
    * All subsequent operations by this thread will be performed on
    * the given ServerLocation. Used for resuming suspended transactions.
    * @param serverLocation
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public void setServerAffinityLocation(ServerLocation serverLocation);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionNoAckOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionNoAckOp.java
index 52e03e5..0ae21a8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionNoAckOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionNoAckOp.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Does a Execution of function on server (possibly without region/cache) 
  * It does not get the resulf from the server (follows Fire&Forget approch)
- * @since 5.8Beta
+ * @since GemFire 5.8Beta
  */
 public class ExecuteFunctionNoAckOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionOp.java
index 682efd3..624e884 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteFunctionOp.java
@@ -48,7 +48,7 @@ import org.apache.logging.log4j.Logger;
 /**
  * Executes the function on server (possibly without region/cache).<br> 
  * Also gets the result back from the server
- * @since 5.8
+ * @since GemFire 5.8
  */
 
 public class ExecuteFunctionOp {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
index 2e03659..ac3aebd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionNoAckOp.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Does a Execution of function on server region
  * It does not get the resul from the server (follows Fire&Forget approch)
- * @since 5.8Beta
+ * @since GemFire 5.8Beta
  */
 public class ExecuteRegionFunctionNoAckOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionOp.java
index 6492190..498c7d4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionOp.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Does a Execution of function on server region.<br>
  * It alos gets result from the server
- * @since 5.8Beta
+ * @since GemFire 5.8Beta
  */
 public class ExecuteRegionFunctionOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
index 73c2324..ce7c3f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
 import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ExecuteRegionFunctionSingleHopOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
index 2f93dab..d8fc9b6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ExplicitConnectionSourceImpl.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
 
 /**
  * A connection source where the list of endpoints is specified explicitly. 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  * TODO - the UnusedServerMonitor basically will force the pool to
  * have at least one connection to each server. Maybe we need to have it

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetAllOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetAllOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetAllOp.java
index e88d9a2..0aaa2ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetAllOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetAllOp.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region getAll on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class GetAllOp {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPRMetaDataOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPRMetaDataOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPRMetaDataOp.java
index 3902b88..9a467f7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPRMetaDataOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPRMetaDataOp.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * one of the servers
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class GetClientPRMetaDataOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPartitionAttributesOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPartitionAttributesOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPartitionAttributesOp.java
index f126038..7f5ba9d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPartitionAttributesOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetClientPartitionAttributesOp.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * specified PartitionedRegion from one of the servers
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public class GetClientPartitionAttributesOp {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetEventValueOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetEventValueOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetEventValueOp.java
index 1038ede..80bc7a7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetEventValueOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetEventValueOp.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
  * Gets (full) value (unlike GetOp, which may get either a full value or a delta
  * depending upon delta flag) of a given event from the ha container on server.
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class GetEventValueOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
index 2e3134f..6864306 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetOp.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region get on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class GetOp {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumByIdOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumByIdOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumByIdOp.java
index 43cf970..7240346 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumByIdOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumByIdOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
 
 /**
  * Retrieve the PDXType, given an integer PDX id, from a server.
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class GetPDXEnumByIdOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumsOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumsOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumsOp.java
index d678235..748a94f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumsOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXEnumsOp.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
 /**
  * Retrieve all known PDX types.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GetPDXEnumsOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForEnumOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForEnumOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForEnumOp.java
index 681f852..2185eac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForEnumOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForEnumOp.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
 
 /**
  * Retrieve the PDXType, given an integer PDX id, from a server.
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class GetPDXIdForEnumOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForTypeOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForTypeOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForTypeOp.java
index 9586d39..92dad3d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForTypeOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXIdForTypeOp.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.pdx.internal.PdxType;
 
 /**
  * Retrieve the PDXType, given an integer PDX id, from a server.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GetPDXIdForTypeOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypeByIdOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypeByIdOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypeByIdOp.java
index 488206c..982eb27 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypeByIdOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypeByIdOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.pdx.internal.PdxType;
 
 /**
  * Retrieve the PDXType, given an integer PDX id, from a server.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GetPDXTypeByIdOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypesOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypesOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypesOp.java
index ea7472c..5fa0cc0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypesOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/GetPDXTypesOp.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.pdx.internal.PdxType;
 /**
  * Retrieve all known PDX types.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GetPDXTypesOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InternalPool.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InternalPool.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InternalPool.java
index fcb0ae8..8c04525 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InternalPool.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InternalPool.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.PoolStats;
  * The contract between a connection source and a connection pool.
  * Provides methods for the connection source to access the cache
  * and update the list of endpoints on the connection pool.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface InternalPool extends Pool, ExecutablePool {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InvalidateOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InvalidateOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InvalidateOp.java
index 88b9f9d..2819ad9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InvalidateOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InvalidateOp.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region invalidate on a server
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class InvalidateOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/KeySetOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/KeySetOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/KeySetOp.java
index 42f7072..c30a90a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/KeySetOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/KeySetOp.java
@@ -30,7 +30,7 @@ import java.util.HashSet;
 
 /**
  * Does a region keySet on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class KeySetOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallback.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallback.java
index 554aff3..12ec348 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallback.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallback.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * A callback to receive notifications about locator discovery. Currently 
  * only used internally.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface LocatorDiscoveryCallback {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallbackAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
index 4aae855..6639e5e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LocatorDiscoveryCallbackAdapter.java
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * A locator discovery callback that does nothing.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class LocatorDiscoveryCallbackAdapter implements

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/MakePrimaryOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/MakePrimaryOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/MakePrimaryOp.java
index b8c4767..3320aab 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/MakePrimaryOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/MakePrimaryOp.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Tell a server to become the primary host of a server-to-client queue
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class MakePrimaryOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Op.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Op.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Op.java
index 19af3de..5247317 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Op.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/Op.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.client.internal;
  * An operation to perform on a server. Used by
  * {@link ExecutablePool} to attempt the operation on 
  * multiple servers until the retryAttempts is exceeded.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface Op {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImpl.java
index 84ffb5d..8410dbd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/OpExecutorImpl.java
@@ -71,7 +71,7 @@ import com.gemstone.gemfire.security.GemFireSecurityException;
  * Called from the client and execute client to server
  * requests against servers. Handles retrying to different servers,
  * and marking servers dead if we get exception from them.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class OpExecutorImpl implements ExecutablePool {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PingOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PingOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PingOp.java
index f5a6d97..fbe0186 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PingOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PingOp.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Ping a server to see if it is still alive.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PingOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
index 65a4dd1..3579769 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PoolImpl.java
@@ -75,7 +75,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * Manages the client side of client to server connections
  * and client queues. 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PoolImpl implements InternalPool {
   public static final String ON_DISCONNECT_CLEAR_PDXTYPEIDS = "gemfire.ON_DISCONNECT_CLEAR_PDXTYPEIDS";
@@ -153,7 +153,7 @@ public class PoolImpl implements InternalPool {
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected void finishCreate(PoolManagerImpl pm) {
     pm.register(this);
@@ -262,7 +262,7 @@ public class PoolImpl implements InternalPool {
    * Return true if the given Pool is compatible with these attributes.
    * Currently this does what equals would but in the future we might
    * decide to weaken the compatibility contract.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean isCompatible(Pool p) {
     if (p == null) return false;
@@ -700,7 +700,7 @@ public class PoolImpl implements InternalPool {
    * It will only execute it once and on one server.
    * @param op the operation to execute
    * @return the result of execution if any; null if not
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object execute(Op op) {
     //if(multiuser)
@@ -721,7 +721,7 @@ public class PoolImpl implements InternalPool {
    * @param op the operation to execute
    * @param retries how many times to retry the operation
    * @return the result of execution if any; null if not
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object execute(Op op, int retries) {
     authenticateIfRequired(op);
@@ -770,7 +770,7 @@ public class PoolImpl implements InternalPool {
    * queues for this pool
    * @param op the operation to execute
    * @return the result of execution if any; null if not
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Object executeOnQueuesAndReturnPrimaryResult(Op op) {
     authenticateOnAllServers(op);
@@ -817,7 +817,7 @@ public class PoolImpl implements InternalPool {
    *
    * @param eventId the EventId of the incoming event
    * @return true if it is already present
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public boolean verifyIfDuplicate(EventID eventId) {
     return ((QueueStateImpl)this.queueManager.getState()).verifyIfDuplicate(eventId);
@@ -1053,7 +1053,7 @@ public class PoolImpl implements InternalPool {
   
   /**
    * Atomic counter used to keep track of services using this pool.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private final AtomicInteger attachCount = new AtomicInteger();
   public static volatile boolean IS_INSTANTIATOR_CALLBACK = false ;
@@ -1061,7 +1061,7 @@ public class PoolImpl implements InternalPool {
   /**
    * Returns number of services currently using/attached to this pool.
    * <p>Made public so it can be used by tests
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public int getAttachCount() {
     return this.attachCount.get();
@@ -1069,7 +1069,7 @@ public class PoolImpl implements InternalPool {
   /**
    * This needs to be called when a service (like a Region or CQService)
    * starts using a pool.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void attach() {
     this.attachCount.getAndIncrement();
@@ -1077,7 +1077,7 @@ public class PoolImpl implements InternalPool {
   /**
    * This needs to be called when a service (like a Region or CQService)
    * stops using a pool.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void detach() {
     this.attachCount.getAndDecrement();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PrimaryAckOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PrimaryAckOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PrimaryAckOp.java
index 3614ac2..a0459d2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PrimaryAckOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PrimaryAckOp.java
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * Send the primary server acknowledgement on the events this client
  * has received and processed from it.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PrimaryAckOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyCache.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyCache.java
index d9a4282..9c7b6ec 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyCache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyCache.java
@@ -48,7 +48,7 @@ import java.util.Set;
  * @see ClientCache#createAuthenticatedView(Properties)
  * @see ProxyQueryService
  * @see ProxyRegion
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ProxyCache implements RegionService {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyRegion.java
index dc8c44e..1113927 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ProxyRegion.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.cache.snapshot.RegionSnapshotServiceImpl;
  * multiuser-authentication attribute is set to true.
  * 
  * @see ProxyCache
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ProxyRegion implements Region {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutAllOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutAllOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutAllOp.java
index 8d7876a..1610456 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutAllOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutAllOp.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region putAll on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PutAllOp {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
index 64d59f5..072ec4e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/PutOp.java
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger;
 
 /**
  * Does a region put (or create) on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PutOp {
   
@@ -347,7 +347,7 @@ public class PutOp {
      * @throws Exception
      *                 if response could not be processed or we received a
      *                 response with a server exception.
-     * @since 6.1
+     * @since GemFire 6.1
      */
     @Override
     protected Object processResponse(Message msg, Connection con)
@@ -411,7 +411,7 @@ public class PutOp {
      * @throws Exception
      *                 if response could not be processed or we received a
      *                 response with a server exception.
-     * @since 6.1
+     * @since GemFire 6.1
      */
     private final void processAck(Message msg, String opName, Connection con)
         throws Exception

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueryOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueryOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueryOp.java
index fb45d08..30c28d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueryOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueryOp.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache.client.ServerOperationException;
 
 /**
  * Does a region query on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class QueryOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManager.java
index f13e2c0..436a13b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManager.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public interface QueueManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
index 7c9b187..3065691 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
@@ -76,7 +76,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * Manages Client Queues. Responsible for creating callback connections and
  * satisfying redundancy requirements.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * 
  */
 public class QueueManagerImpl implements QueueManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
index 7ba790e..382d4a9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
@@ -226,7 +226,7 @@ public class QueueStateImpl implements QueueState {
    * send an ack. 2)It will expire the entries which have exceeded the specified
    * expiry time and for which ack has been alerady sent.
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    * 
    */
 
@@ -372,7 +372,7 @@ public class QueueStateImpl implements QueueState {
    * A class to store sequenceId and the creation time of the object to be used
    * for expiring the entry
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    * 
    */
   public static class SequenceIdAndExpirationObject {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java
index 27b1a0c..b94c2ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityLogWriter.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * This class wraps an existing {@link InternalLogWriter} instance to add the
  * security prefix feature mentioned above.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public final class SecurityLogWriter extends LogWriterImpl implements InternalLogWriter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java
index 98bf284..d051cef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SecurityManagerLogWriter.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * This class extends the {@link ManagerLogWriter} to add the security prefix
  * feature mentioned above.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public final class SecurityManagerLogWriter extends ManagerLogWriter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SortLogFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SortLogFile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SortLogFile.java
index ad53b97..cb7df31 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SortLogFile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/SortLogFile.java
@@ -31,7 +31,7 @@ import java.util.*;
  * @see LogFileParser
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class SortLogFile {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/modules/util/RegionConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/modules/util/RegionConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/modules/util/RegionConfiguration.java
index 5ad8152..cf8fa20 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/modules/util/RegionConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/modules/util/RegionConfiguration.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.CustomExpiry;
  * attributes for a <code>Region</code> to be created on the server.
  *
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 @SuppressWarnings({"serial","unchecked"})
 public class RegionConfiguration implements DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketUtils.java
index 464484a..6f635bd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketUtils.java
@@ -26,7 +26,7 @@ import java.net.Socket;
  * <p/>
  * @see java.net.ServerSocket
  * @see java.net.Socket
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class SocketUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/DataType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/DataType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/DataType.java
index c6bbbd1..01ea834 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/DataType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/DataType.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.pdx.internal.PdxType;
  * Determines the data type of the bytes in an off-heap MemoryBlock. This is
  * used by the tests for inspection of the off-heap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class DataType implements DSCODE {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocator.java
index dfe675d..56b6a8a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocator.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.offheap;
  * Basic contract for a heap that manages off heap memory. Any MemoryChunks allocated from a heap
  * are returned to that heap when freed.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface MemoryAllocator {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java
index 70a203a..71603f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryAllocatorImpl.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * If we can not find enough free memory then all the existing free memory is defragmented.
  * If we still do not have enough to make the allocation an exception is thrown.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class MemoryAllocatorImpl implements MemoryAllocator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryBlock.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryBlock.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryBlock.java
index 8725722..abe748b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryBlock.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryBlock.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.offheap;
  * Basic size and usage information about an off-heap memory block under
  * inspection. For test validation only.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface MemoryBlock {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryInspector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryInspector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryInspector.java
index c14d445..e2208fb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryInspector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryInspector.java
@@ -21,7 +21,7 @@ import java.util.List;
 /**
  * Provides for inspection of meta-data for off-heap memory blocks.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface MemoryInspector {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryUsageListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryUsageListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryUsageListener.java
index 6e8f79f..53db4e4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryUsageListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/MemoryUsageListener.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.offheap;
 /**
  * Defines callback for notification when off-heap memory usage changes.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface MemoryUsageListener {
   public void updateMemoryUsed(long bytesUsed);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
index 0f33d5a..f3f064a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapHelper.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
 /**
  * Utility class that provides static method to do some common tasks for off-heap references.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapHelper {
   private OffHeapHelper() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapMemoryStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapMemoryStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapMemoryStats.java
index aa4333d..1204814 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapMemoryStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapMemoryStats.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.Statistics;
 /**
  * Statistics for off-heap memory storage.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface OffHeapMemoryStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelper.java
index 0909306..b20d9a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionEntryHelper.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * It allows common code to be shared for all the
  * classes we have that implement {@link OffHeapRegionEntry}.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapRegionEntryHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java
index 2790b5d..2f2bf1a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OffHeapStorage.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /**
  * Enables off-heap storage by creating a MemoryAllocator.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapStorage implements OffHeapMemoryStats {
   public static final String STAY_CONNECTED_ON_OUTOFOFFHEAPMEMORY_PROPERTY = "gemfire.offheap.stayConnectedOnOutOfOffHeapMemory";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryListener.java
index 2a346e8..4d592e4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryListener.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.OutOfOffHeapMemoryException;
  * connection causes the System and Cache to close in order to avoid data
  * inconsistency.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface OutOfOffHeapMemoryListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/Releasable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/Releasable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/Releasable.java
index 3b9a17c..74b793f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/Releasable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/Releasable.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.offheap;
  * Instances that implement this interface must have release called on them
  * before the instance becomes garbage.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface Releasable {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/SlabImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/SlabImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/SlabImpl.java
index 3169352..2bdc204 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/SlabImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/SlabImpl.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.offheap;
 /**
  * Implements the Slab interface using AddressableMemoryManager.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class SlabImpl implements Slab {
   private final long address;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/StoredObject.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/StoredObject.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/StoredObject.java
index 710149f..47ad4e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/StoredObject.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/offheap/StoredObject.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained;
  * To decrement the count call {@link #release()}.
  * At some point in the future it may also be used for values stored in heap regions. 
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public interface StoredObject extends Sendable, CachedDeserializable, Releasable {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/AttachProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/AttachProcessUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/AttachProcessUtils.java
index 54f0b4b..47ab7f5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/AttachProcessUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/AttachProcessUtils.java
@@ -23,7 +23,7 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
 /**
  * Implementation of the {@link ProcessUtils} SPI that uses the JDK Attach API.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 final class AttachProcessUtils implements InternalProcessUtils {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReader.java
index b3d5f20..6e7c756 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/BlockingProcessStreamReader.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * 
  * Extracted from ProcessStreamReader.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 public final class BlockingProcessStreamReader extends ProcessStreamReader {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ClusterConfigurationNotAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ClusterConfigurationNotAvailableException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ClusterConfigurationNotAvailableException.java
index a8f17c4..1ee8f78 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ClusterConfigurationNotAvailableException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ClusterConfigurationNotAvailableException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.process;
 /**
  * Exception thrown during server startup when  it requests the locators for shared configuration and does not receive it.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class ClusterConfigurationNotAvailableException extends RuntimeException {
   private static final long serialVersionUID = -3448160213553925462L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ConnectionFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ConnectionFailedException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ConnectionFailedException.java
index e5b3064..449b87a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ConnectionFailedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ConnectionFailedException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.process;
 /**
  * A ConnectionFailedException is thrown if connection to a process fails.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class ConnectionFailedException extends Exception {
   private static final long serialVersionUID = 5622636452836752700L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlFileWatchdog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlFileWatchdog.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlFileWatchdog.java
index f94c5e8..6a9ffc4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlFileWatchdog.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlFileWatchdog.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Invokes a ControlRequestHandler when a control file has been created.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 final class ControlFileWatchdog implements Runnable {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlNotificationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlNotificationHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlNotificationHandler.java
index b52384c..ce8552d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlNotificationHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControlNotificationHandler.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.AbstractLauncher.ServiceState;
  * Separated from ControllableProcess so that an internal object can implement
  * this to avoid exposing these methods via the customer API.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ControlNotificationHandler {
   public void handleStop();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControllableProcess.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControllableProcess.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControllableProcess.java
index f21930d..5ef6a8b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControllableProcess.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ControllableProcess.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.process.ControlFileWatchdog.ControlRequestH
  * Creates the PID file and ControlFileWatchdogs to monitor working directory
  * for creation of stop or status request files.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class ControllableProcess {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileAlreadyExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileAlreadyExistsException.java
index 7cf6c73..9c761ac 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileAlreadyExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileAlreadyExistsException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.process;
  * and the launcher expects to create a new pid file without forcing the
  * deletion of the old one.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class FileAlreadyExistsException extends Exception {
   private static final long serialVersionUID = 5471082555536094256L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileControllerParameters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileControllerParameters.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileControllerParameters.java
index eb98233..a6a0c4a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileControllerParameters.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileControllerParameters.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.process.ProcessController.Arguments;
  * Defines {@link ProcessController} {@link Arguments} that must be implemented
  * to support the {@link FileProcessController}.
  *  
- * @since 8.0
+ * @since GemFire 8.0
  */
 interface FileControllerParameters extends Arguments {
   public File getPidFile();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java
index 45c5bba..84440e2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/FileProcessController.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.lang.AttachAPINotFoundException;
  * Controls a {@link ControllableProcess} using files to communicate between
  * processes.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class FileProcessController implements ProcessController {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessController.java
index 4339a53..11c2443 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessController.java
@@ -46,7 +46,7 @@ import com.sun.tools.attach.VirtualMachine;
 /**
  * Attaches to a local process to control it via JMX.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * @deprecated as of 8.0 please use {@link ControllableProcess} instead
  */
 public final class LocalProcessController {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java
index 4840d75..b7cd708 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/LocalProcessLauncher.java
@@ -32,7 +32,7 @@ import java.io.IOException;
  * <li>http://weblogs.java.net/blog/kohsuke/archive/2009/01/writing_a_unix.html
  * <li>http://www.enderunix.org/docs/eng/daemon.php
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class LocalProcessLauncher {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanControllerParameters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanControllerParameters.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanControllerParameters.java
index b006ba6..7fe48f4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanControllerParameters.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanControllerParameters.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.process.ProcessController.Arguments;
  * Defines {@link ProcessController} {@link Arguments} that must be implemented
  * to support the {@link MBeanProcessController}.
 
- * @since 8.0
+ * @since GemFire 8.0
  */
 interface MBeanControllerParameters extends Arguments {
   public ObjectName getNamePattern();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanInvocationFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanInvocationFailedException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanInvocationFailedException.java
index fd80148..3f6331a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanInvocationFailedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanInvocationFailedException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.process;
 /**
  * A MBeanInvocationFailedException is thrown if invocation of the mbean failed.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class MBeanInvocationFailedException extends Exception {
   private static final long serialVersionUID = 7991096466859690801L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanProcessController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanProcessController.java
index eaafb8d..48bbb4d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanProcessController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/MBeanProcessController.java
@@ -43,7 +43,7 @@ import com.sun.tools.attach.VirtualMachine;
  * Controls a {@link ControllableProcess} using the Attach API to manipulate
  * MBeans.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class MBeanProcessController implements ProcessController {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NativeProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NativeProcessUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NativeProcessUtils.java
index eca48eb..a59529c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NativeProcessUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NativeProcessUtils.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.shared.NativeCalls;
 /**
  * Implementation of the {@link ProcessUtils} SPI that uses {@link NativeCalls}.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 final class NativeProcessUtils implements InternalProcessUtils {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReader.java
index 89e5a52..e876e2b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/NonBlockingProcessStreamReader.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.util.StopWatch;
  * continue reading after the Process terminates in order to fully read the last
  * of that Process' output (such as a stack trace).
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 public final class NonBlockingProcessStreamReader extends ProcessStreamReader {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidFile.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidFile.java
index 0c5e92b..2c42a6c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidFile.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidFile.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.util.StopWatch;
  * File wrapper that adds support for reading process id (pid) from a pid file
  * written to disk by GemFire processes.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 public class PidFile {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidUnavailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidUnavailableException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidUnavailableException.java
index 1e7e4d5..a7d0bf4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidUnavailableException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/PidUnavailableException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.process;
  * A PidUnavailableException is thrown when the pid cannot be parsed from
  * the RuntimeMXBean name or otherwise determined.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class PidUnavailableException extends Exception {
   private static final long serialVersionUID = -1660269538268828059L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
index 44d212a..50790ce 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessController.java
@@ -22,7 +22,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * Defines the operations for controlling a running process.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ProcessController {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java
index 1391961..693c676 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerFactory.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.util.StopWatch;
  * Manages which implementation of {@link ProcessController} will be used and
  * constructs the instance.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class ProcessControllerFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerParameters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerParameters.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerParameters.java
index 849e327..41ad642 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerParameters.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessControllerParameters.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.process;
  * implement <code>ProcessControllerArguments</code> would typically be in a different
  * package.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ProcessControllerParameters extends FileControllerParameters, MBeanControllerParameters {
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java
index c85567d..336207c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessLauncherContext.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.io.TeePrintStream;
  * Thread based context for launching a process. GemFire internals can acquire
  * optional configuration details from a process launcher via this context.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class ProcessLauncherContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessStreamReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessStreamReader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessStreamReader.java
index 26b10a9..fb74134 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessStreamReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessStreamReader.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * Reads the output stream of a Process.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class ProcessStreamReader implements Runnable {
   private static final Logger logger = LogService.getLogger();
@@ -208,7 +208,7 @@ public abstract class ProcessStreamReader implements Runnable {
   /**
    * Builds a ProcessStreamReader.
    * 
-   * @since 8.2
+   * @since GemFire 8.2
    */
   public static class Builder {
     protected Process process;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessTerminatedAbnormallyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessTerminatedAbnormallyException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessTerminatedAbnormallyException.java
index 9ca54f9..dabcc4c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessTerminatedAbnormallyException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessTerminatedAbnormallyException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
  * terminated abnormally, and it's exit code is captured along with this RuntimeException.
  * </p>
  * @see com.gemstone.gemfire.GemFireException
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class ProcessTerminatedAbnormallyException extends GemFireException {
   private static final long serialVersionUID = -1181367425266595492L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java
index 6b0c309..17e5dd5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessType.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.process;
  * Enumeration of GemFire {@link ControllableProcess} types and the file names
  * associated with controlling its lifecycle.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public enum ProcessType {
   LOCATOR ("LOCATOR", "vf.gf.locator"),

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessUtils.java
index db99615..7cac3cd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/ProcessUtils.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.util.IOUtils;
 /**
  * Utility operations for processes such as identifying the process id (pid).
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class ProcessUtils {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/StartupStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/StartupStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/StartupStatus.java
index a775e2a..59e6121 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/StartupStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/StartupStatus.java
@@ -36,7 +36,7 @@ public class StartupStatus {
    * If a startup listener is registered,
    * the message will be written to the listener as well
    * to be reported to a user.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static synchronized void startup(StringId msgID, Object[] params) {
     String message = msgID.toLocalizedString(params);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/UnableToControlProcessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/UnableToControlProcessException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/UnableToControlProcessException.java
index fbca34f..cca0593 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/UnableToControlProcessException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/UnableToControlProcessException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.process;
  * Exception indicating that an attempt to control a {@link ControllableProcess}
  * has failed for some reason.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class UnableToControlProcessException extends Exception {
   private static final long serialVersionUID = 7579463534993125290L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandler.java
index 7a14827..67296bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/AbstractSignalNotificationHandler.java
@@ -31,7 +31,7 @@ import java.util.Set;
  * @see com.gemstone.gemfire.internal.process.signal.Signal
  * @see com.gemstone.gemfire.internal.process.signal.SignalEvent
  * @see com.gemstone.gemfire.internal.process.signal.SignalListener
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public abstract class AbstractSignalNotificationHandler {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
index cf5c3f8..ef855fb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/Signal.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * Signals defined in the enumerated type were based on Open BSD and the IBM JVM...
  * </p>
  * @see com.gemstone.gemfire.internal.process.signal.SignalType
- * @since 7.0
+ * @since GemFire 7.0
  * @see <a href="http://www.fromdual.com/operating-system-signals">http://www.fromdual.com/operating-system-signals</a>
  * @see <a href="http://www.ibm.com/developerworks/java/library/i-signalhandling/#table1">http://www.ibm.com/developerworks/java/library/i-signalhandling/#table1</a>
  * @see <a href="http://publib.boulder.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.aix.70.doc%2Fuser%2Fsighand.html">http://publib.boulder.ibm.com/infocenter/java7sdk/v7r0/index.jsp?topic=%2Fcom.ibm.java.aix.70.doc%2Fuser%2Fsighand.html</a>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalEvent.java
index d88adf5..0734771 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalEvent.java
@@ -23,7 +23,7 @@ import java.util.EventObject;
  * The SignalEvent class...
  * </p>
  * @see java.util.EventObject
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class SignalEvent extends EventObject {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalListener.java
index 729da20..fa39cf2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalListener.java
@@ -23,7 +23,7 @@ import java.util.EventListener;
  * The SignalListener class...
  * </p>
  * @see java.util.EventListener
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public interface SignalListener extends EventListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalType.java
index ec01081..a9cf9c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/process/signal/SignalType.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal.process.signal;
 /**
  * The SignalType class...
  * </p>
- * @since 7.0
+ * @since GemFire 7.0
  */
 public enum SignalType {
   CONTROL("Other signals that are used by the JVM for control purposes."),

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequest.java
index 9ec7578..0e37ac8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequest.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * operation is encapsulated in a {@link OperationContext} object that can be
  * modified by the pre-processing authorization callbacks.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class AuthorizeRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequestPP.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequestPP.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequestPP.java
index 17082bb..415fe4e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequestPP.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/AuthorizeRequestPP.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * being passed for the operation is encapsulated in a {@link OperationContext}
  * object that can be modified by the post-processing authorization callbacks.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class AuthorizeRequestPP {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPostAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPostAuthorization.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPostAuthorization.java
index 40cdc15..2e9844f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPostAuthorization.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPostAuthorization.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * operation only if the authorization field in {@link ObjectWithAuthz} object
  * allows the current principal.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class FilterPostAuthorization implements AccessControl {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPreAuthorization.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPreAuthorization.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPreAuthorization.java
index df6d136..2693f87 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPreAuthorization.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/FilterPreAuthorization.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.security.NotAuthorizedException;
  * pre-operation phase to add an integer denoting which <code>Principal</code>s
  * would be allowed to get that object.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class FilterPreAuthorization implements AccessControl {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
index f0fc27a..ead57ce 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCalls.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.SystemFailure;
  * This class is also referenced by ODBC/.NET drivers so it should not refer to
  * any classes other than standard JDK or those within the same package.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class NativeCalls {
 
@@ -485,7 +485,7 @@ public abstract class NativeCalls {
    * for re-reading configuration files or any other appropriate actions on
    * receiving HUP signal as is the convention in other servers.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public static interface RehashServerOnSIGHUP {
 
@@ -533,7 +533,7 @@ public abstract class NativeCalls {
    * implementation could be initialized (e.g. if JNA itself does not provide an
    * implementation for the platform, or JNA is not found).
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public static class NativeCallsGeneric extends NativeCalls {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCallsJNAImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCallsJNAImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCallsJNAImpl.java
index 1854992..ed74232 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCallsJNAImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeCallsJNAImpl.java
@@ -60,7 +60,7 @@ import java.util.HashMap;
  * yet and its not a mature library yet, so not using it. Can revisit once this
  * changes.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public final class NativeCallsJNAImpl {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeErrorException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeErrorException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeErrorException.java
index 5a67417..afcdd73 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeErrorException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/NativeErrorException.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.shared;
  * <code>LastErrorException</code> class, and also for ODBC/.NET drivers that
  * don't use JNA.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class NativeErrorException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/TCPSocketOptions.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/TCPSocketOptions.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/TCPSocketOptions.java
index e4cd826..2995b42 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/TCPSocketOptions.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/shared/TCPSocketOptions.java
@@ -25,7 +25,7 @@ import java.net.Socket;
  * Passed to {@link NativeCalls} API to set these options on the Java
  * {@link Socket} using native OS specific calls.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public enum TCPSocketOptions {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CounterMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CounterMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CounterMonitor.java
index 81c034f..b3e956a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CounterMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CounterMonitor.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.internal.statistics;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class CounterMonitor extends StatisticsMonitor {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/GaugeMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/GaugeMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/GaugeMonitor.java
index 4dd331e..f9f56be 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/GaugeMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/GaugeMonitor.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.internal.statistics;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class GaugeMonitor extends StatisticsMonitor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/IgnoreResourceException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/IgnoreResourceException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/IgnoreResourceException.java
index efe2005..2abf4b8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/IgnoreResourceException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/IgnoreResourceException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  * <p/>
  * Extracted from {@link com.gemstone.gemfire.internal.StatArchiveWriter}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class IgnoreResourceException extends GemFireCheckedException {
   private static final long serialVersionUID = 3371071862581873081L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/MapBasedStatisticsNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/MapBasedStatisticsNotification.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/MapBasedStatisticsNotification.java
index be77a2d..892764e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/MapBasedStatisticsNotification.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/MapBasedStatisticsNotification.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.StatisticsType;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class MapBasedStatisticsNotification implements StatisticsNotification {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceInstance.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceInstance.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceInstance.java
index 68de896..0de95e2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceInstance.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceInstance.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.Statistics;
  * <p/>
  * Extracted from {@link com.gemstone.gemfire.internal.StatArchiveWriter}.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ResourceInstance {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceType.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceType.java
index 48d9518..d401969 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ResourceType.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.StatisticsType;
  * <p/>
  * Extracted from {@link com.gemstone.gemfire.internal.StatArchiveWriter}.
  *  
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ResourceType {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
index 506dae6..dfb502b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleCollector.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * <p/>
  * Extracted from StatArchiveWriter.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class SampleCollector {
 
@@ -569,7 +569,7 @@ public class SampleCollector {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public class MarkableSampleHandler implements SampleHandler {
 
@@ -649,7 +649,7 @@ public class SampleCollector {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public class SampleHandlers implements Iterable<MarkableSampleHandler> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleHandler.java
index 451973f..2ff0373 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SampleHandler.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Defines the operations required to handle statistics samples and receive
  * notifications of ResourceTypes and ResourceInstances.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface SampleHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SimpleStatisticId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SimpleStatisticId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SimpleStatisticId.java
index cfb8523..6569425 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SimpleStatisticId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/SimpleStatisticId.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.Statistics;
  * StatisticsType may describe one or more Statistics instances, while a 
  * StatisticDescriptor may describe one or more StatisticId instances.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class SimpleStatisticId implements StatisticId {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveDescriptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveDescriptor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveDescriptor.java
index 64d13c4..6d6624a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveDescriptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveDescriptor.java
@@ -28,7 +28,7 @@ package com.gemstone.gemfire.internal.statistics;
  * instead of a constructor with many similar parameters (ie, multiple Strings
  * which could easily be interposed with one another).
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class StatArchiveDescriptor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandler.java
index f1a7a1f..e686ad6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandler.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger;
  * {@link com.gemstone.gemfire.internal.StatArchiveWriter} for the currently
  * open archive file (unless archiving is disabled).
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class StatArchiveHandler implements SampleHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandlerConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandlerConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandlerConfig.java
index 28df256..dd46013 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandlerConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatArchiveHandlerConfig.java
@@ -24,7 +24,7 @@ import java.io.File;
  * <p/>
  * Implemented by {@link com.gemstone.gemfire.internal.HostStatSampler}.
 
- * @since 7.0
+ * @since GemFire 7.0
  * @see com.gemstone.gemfire.distributed.internal.RuntimeDistributionConfigImpl
  */
 public interface StatArchiveHandlerConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java
index 70e0e17..659d4b2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatMonitorHandler.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class StatMonitorHandler implements SampleHandler {
 
@@ -157,7 +157,7 @@ public class StatMonitorHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   class StatMonitorNotifier implements Runnable {
     
@@ -311,7 +311,7 @@ public class StatMonitorHandler implements SampleHandler {
   }
   
   /**
-   * @since 7.0
+   * @since GemFire 7.0
    */
   static class MonitorTask {
     private final long sampleTimeMillis; 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticId.java
index cf1bbab..91008c8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticId.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.Statistics;
  * StatisticsType may describe one or more Statistics instances, while a 
  * StatisticDescriptor may describe one or more StatisticId instances.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface StatisticId {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticNotFoundException.java
index 1d60b47..3c84be0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticNotFoundException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.statistics;
 import com.gemstone.gemfire.GemFireCheckedException;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class StatisticNotFoundException extends GemFireCheckedException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsListener.java
index f8462f2..ed139c3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsListener.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.internal.statistics;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface StatisticsListener {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitor.java
index 1940ac9..3081cbd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsMonitor.java
@@ -25,7 +25,7 @@ import java.util.List;
  * static monitoring that will fire for all instances even ones that may not 
  * yet be created at the time this monitor is defined
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class StatisticsMonitor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsNotification.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsNotification.java
index e4e8ea5..2b012f5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsNotification.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsNotification.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.StatisticsType;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface StatisticsNotification extends Iterable<StatisticId> {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsSampler.java
index 7feb074..a585944 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/StatisticsSampler.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.Statistics;
  * Defines the minimal contract for a StatisticsSampler. This is used by
  * classes that need to interact with the sampler.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface StatisticsSampler {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ValueMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ValueMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ValueMonitor.java
index 6c0b853..211719f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ValueMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/ValueMonitor.java
@@ -50,7 +50,7 @@ import com.gemstone.gemfire.internal.StatisticDescriptorImpl;
       };
     }
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * @see com.gemstone.gemfire.Statistics
  */
 public final class ValueMonitor extends StatisticsMonitor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/Atomic50StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/Atomic50StatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/Atomic50StatisticsImpl.java
index 10ad8ce..f374394 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/Atomic50StatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/stats50/Atomic50StatisticsImpl.java
@@ -32,7 +32,7 @@ import java.util.*;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public class Atomic50StatisticsImpl extends StatisticsImpl {
@@ -304,7 +304,7 @@ public class Atomic50StatisticsImpl extends StatisticsImpl {
   /**
    * Used to take striped thread stats and "roll them up" into a single
    * shared stat.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   @Override
   public void prepareForSample() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/BaseMsgStreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/BaseMsgStreamer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/BaseMsgStreamer.java
index b5eb60e..aa17719 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/BaseMsgStreamer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/BaseMsgStreamer.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.i18n.LogWriterI18n;
  * Base interface for {@link MsgStreamer} and {@link MsgStreamerList} to send a
  * message over a list of connections to one or more peers.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public interface BaseMsgStreamer {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ByteBufferInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ByteBufferInputStream.java
index 8c06de2..939f9ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ByteBufferInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ByteBufferInputStream.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.offheap.StoredObject;
  * if the end of the buffer is reached before we read the full amount. That
  * breaks the contract for InputStream and DataInput, but it works for our code.
  * 
- * @since 3.0
+ * @since GemFire 3.0
  */
 
 public class ByteBufferInputStream extends InputStream implements DataInput, java.io.Externalizable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectExceptions.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectExceptions.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectExceptions.java
index fcaacbc..b9b3fc5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectExceptions.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectExceptions.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  *
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class ConnectExceptions extends GemFireCheckedException {
 private static final long serialVersionUID = -4173688946448867706L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index 6e949b2..ed20f21 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -89,7 +89,7 @@ import com.gemstone.gemfire.internal.util.concurrent.ReentrantSemaphore;
     message objects.  A Connection may be closed to preserve system
     resources and will automatically be reopened when it's needed.</p>
 
-    @since 2.0
+    @since GemFire 2.0
 
 */
 
@@ -261,7 +261,7 @@ public class Connection implements Runnable {
   /**
    * How long to wait if receiver will not accept a message before we
    * go into queue mode.
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   private int asyncDistributionTimeout = 0;
   /**
@@ -269,7 +269,7 @@ public class Connection implements Runnable {
    * with the receiver not accepting any messages,
    * before kicking the receiver out of the distributed system.
    * Ignored if asyncDistributionTimeout is zero.
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   private int asyncQueueTimeout = 0;
   /**
@@ -278,7 +278,7 @@ public class Connection implements Runnable {
    * before kicking the receiver out of the distributed system.
    * Ignored if asyncDistributionTimeout is zero.
    * Canonicalized to bytes (property file has it as megabytes
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   private long asyncMaxQueueSize = 0;
   /**
@@ -2957,7 +2957,7 @@ public class Connection implements Runnable {
 
 
   /**
-   * @since 4.2.2
+   * @since GemFire 4.2.2
    */
   private void disconnectSlowReceiver() {
     synchronized (this.outgoingQueue) {
@@ -4043,7 +4043,7 @@ public class Connection implements Runnable {
   /**
    * answers whether this connection was initiated in this vm
    * @return true if the connection was initiated here
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected boolean getOriginatedHere() {
     return !this.isReceiver;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionException.java
index 604b405..e25d8e1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.tcp;
 import com.gemstone.gemfire.GemFireException;
 
 /**
-    @since 3.0
+    @since GemFire 3.0
    
  */
 public class ConnectionException extends GemFireException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
index e4b35a2..7161088 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ConnectionTable.java
@@ -63,7 +63,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
     Connections represent a pipe between two endpoints represented
     by generic DistributedMembers.</p>
 
-    @since 2.1
+    @since GemFire 2.1
 */
 /*
     Note: We no longer use InputMultiplexer
@@ -1083,7 +1083,7 @@ public class ConnectionTable  {
    * records the current outgoing message count on all thread-owned
    * ordered connections.  This does not synchronize or stop new connections
    * from being formed or new messages from being sent
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected void getThreadOwnedOrderedConnectionState(DistributedMember member,
       Map result) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ImmutableByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ImmutableByteBufferInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ImmutableByteBufferInputStream.java
index 2bfa823..ba83e6f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ImmutableByteBufferInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/ImmutableByteBufferInputStream.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.offheap.StoredObject;
  * create an instance of ByteBufferInputStream instead.
  * Note that even though this class is immutable the position on its ByteBuffer can change.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class ImmutableByteBufferInputStream extends ByteBufferInputStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
index 9582631..c3d29dd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgDestreamer.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * This allows us to receive a message without needing to
  * read it completely into a buffer before we can start deserializing it.
 
-    @since 5.0.2
+    @since GemFire 5.0.2
    
     */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgIdGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgIdGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgIdGenerator.java
index b4c0d07..c6cc2c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgIdGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgIdGenerator.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.UniqueIdGenerator;
  * Failure to call release will eventually cause obtain to fail with an exception.
  * <p>Currently ids are in the range 0..32767 inclusive.
  *
- * @since 5.0.2
+ * @since GemFire 5.0.2
    
 */
 public class MsgIdGenerator {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java
index c593b27..9cc9174 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 /** MsgOutputStream should no longer be used except in Connection
  * to do the handshake. Otherwise MsgStreamer should always be used.
 
- @since 3.0
+ @since GemFire 3.0
    
 */
 public class MsgOutputStream extends OutputStream implements ObjToByteArraySerializer {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAction.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAction.java
index b6957a9..8bc1aaf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAction.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache;
 import javax.print.attribute.EnumSyntax;
 /**
  * The action that an {@link com.gemstone.gemfire.cache.EvictionAlgorithm} takes.
- * @since 5.0
+ * @since GemFire 5.0
  * @see com.gemstone.gemfire.cache.EvictionAlgorithm
  * @see com.gemstone.gemfire.internal.cache.EvictionAttributesImpl
  */
@@ -84,7 +84,7 @@ public final class EvictionAction extends EnumSyntax
   /**
    * Returns the eviction action the corresponds to the given parameter.
    * Returns <code>null</code> if no action corresponds.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static EvictionAction parseValue(int v) {
     if (v < 0 || v >= enumValueTable.length) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAlgorithm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAlgorithm.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAlgorithm.java
index 3911431..0ec010e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAlgorithm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAlgorithm.java
@@ -20,7 +20,7 @@ import javax.print.attribute.EnumSyntax;
 
 /** The algorithm used to determine when to perform an {@link com.gemstone.gemfire.cache.EvictionAction}
  * 
- * @since 5.0
+ * @since GemFire 5.0
  * @see com.gemstone.gemfire.cache.EvictionAction
  * @see com.gemstone.gemfire.internal.cache.EvictionAttributesImpl
  */
@@ -98,7 +98,7 @@ public final class EvictionAlgorithm extends EnumSyntax
   /**
    * Returns the eviction action the corresponds to the given parameter.
    * Returns <code>null</code> if no action corresponds.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static EvictionAlgorithm parseValue(int v) {
     if (v < 0 || v >= enumValueTable.length) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributes.java
index cc286e8..5f086ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributes.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
  *
  * @see com.gemstone.gemfire.cache.AttributesFactory#setEvictionAttributes(EvictionAttributes)
  * @see com.gemstone.gemfire.cache.AttributesMutator
- * @since 5.0
+ * @since GemFire 5.0
  */
 @SuppressWarnings("serial")
 public abstract class EvictionAttributes implements DataSerializable {
@@ -110,7 +110,7 @@ public abstract class EvictionAttributes implements DataSerializable {
    * with default {@linkplain #DEFAULT_ENTRIES_MAXIMUM maximum}
    * and given <code>evictionAction</code>
    * @see #createLRUEntryAttributes()
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static EvictionAttributes createLRUEntryAttributes(EvictionAction evictionAction) {
     return new EvictionAttributesImpl().setAlgorithm(EvictionAlgorithm.LRU_ENTRY).setAction(evictionAction)
@@ -363,7 +363,7 @@ public abstract class EvictionAttributes implements DataSerializable {
    * given <code>sizer</code>,
    * and default {@linkplain #DEFAULT_MEMORY_MAXIMUM maximum}
    * @see #createLRUMemoryAttributes()
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static EvictionAttributes createLRUMemoryAttributes(ObjectSizer sizer) {
     return new EvictionAttributesImpl().setAlgorithm(EvictionAlgorithm.LRU_MEMORY).setAction(
@@ -388,7 +388,7 @@ public abstract class EvictionAttributes implements DataSerializable {
    * given <code>sizer</code>,
    * and default {@linkplain #DEFAULT_MEMORY_MAXIMUM maximum}
    * @see #createLRUMemoryAttributes()
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static EvictionAttributes createLRUMemoryAttributes(ObjectSizer sizer, EvictionAction evictionAction) {
     return new EvictionAttributesImpl().setAlgorithm(EvictionAlgorithm.LRU_MEMORY).setAction(evictionAction)
@@ -474,7 +474,7 @@ public abstract class EvictionAttributes implements DataSerializable {
 
   /**
    * @return an EvictionAttributes for the  LIFOCapacityController
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static EvictionAttributes createLIFOEntryAttributes(int maximumEntries, EvictionAction evictionAction) {
     return new EvictionAttributesImpl().setAlgorithm(EvictionAlgorithm.LIFO_ENTRY).setAction(evictionAction)
@@ -483,7 +483,7 @@ public abstract class EvictionAttributes implements DataSerializable {
 
   /**
    * @return an EvictionAttributes for the MemLIFOCapacityController
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static EvictionAttributes createLIFOMemoryAttributes(int maximumMegabytes, EvictionAction evictionAction) {
     return new EvictionAttributesImpl().setAlgorithm(EvictionAlgorithm.LIFO_MEMORY).setAction(evictionAction)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributesMutator.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributesMutator.java
index 77dcab7..9f4af59 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributesMutator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/EvictionAttributesMutator.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
  * The EvictionAttributesMutator allows changes to be made to a 
  * {@link com.gemstone.gemfire.cache.EvictionAttributes}. It is returned
  * by {@link com.gemstone.gemfire.cache.AttributesMutator#getEvictionAttributesMutator()}
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface EvictionAttributesMutator
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAction.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAction.java
index f16820b..dace6c0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAction.java
@@ -26,7 +26,7 @@ import java.io.*;
  *
  *
  * @see ExpirationAttributes
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class ExpirationAction implements Serializable {
     private static final long serialVersionUID = 658925707882047900L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAttributes.java
index 1c463f7..ad854e7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/ExpirationAttributes.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.InternalDataSerializer;
  * @see AttributesFactory
  * @see RegionAttributes
  * @see AttributesMutator
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class ExpirationAttributes implements DataSerializable { 
   private static final long serialVersionUID = 5956885652945706394L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/FailedSynchronizationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/FailedSynchronizationException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/FailedSynchronizationException.java
index ee22889..7c44307 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/FailedSynchronizationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/FailedSynchronizationException.java
@@ -31,7 +31,7 @@ import javax.transaction.UserTransaction;
  * @see UserTransaction#setRollbackOnly
  * @see Transaction#registerSynchronization
  * @see Status
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class FailedSynchronizationException extends CacheRuntimeException {
 private static final long serialVersionUID = -6225053492344591496L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionAttributes.java
index 69bbfc7..cb648db 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionAttributes.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.FixedPartitionAttributesImpl;
  * @see com.gemstone.gemfire.cache.PartitionAttributes
  * @see com.gemstone.gemfire.cache.PartitionAttributesFactory
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public abstract class FixedPartitionAttributes {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionResolver.java
index 9450856..db77807 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/FixedPartitionResolver.java
@@ -54,7 +54,7 @@ import java.util.Set;
  * &nbsp }<br>
  *
  * @see PartitionResolver
- * @since 6.6
+ * @since GemFire 6.6
  *
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayConfigurationException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayConfigurationException.java
index f89c3e5..954d6c8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayConfigurationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayConfigurationException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache;
 /**
  * An exception indicating that a gateway configuration
  * will not work with the remote side of the gateway's configuration.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class GatewayConfigurationException extends GatewayException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayException.java
index 93bc723..f8a9d0e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/GatewayException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  * An exception thrown by a <code>Gateway</code>.
  *
  *
- * @since 4.2
+ * @since GemFire 4.2
  */
 public class GatewayException extends OperationAbortedException {
 private static final long serialVersionUID = 8090143153569084886L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
index 96a8ce6..b1ac678 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/GemFireCache.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
  * <li> {@link ClientCacheFactory#create()} creates a client instance of {@link ClientCache}.
  * </ul>
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface GemFireCache extends RegionService {
   /** Returns the name of this cache.
@@ -62,14 +62,14 @@ public interface GemFireCache extends RegionService {
    * resources.
    * 
    * @return <code>ResourceManager</code> for managing this cache's resources
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ResourceManager getResourceManager();
 
   /**
    * Sets the "copy on read" feature for cache read operations.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setCopyOnRead(boolean copyOnRead);
 
@@ -78,7 +78,7 @@ public interface GemFireCache extends RegionService {
    * 
    * @return true if "copy on read" is enabled, false otherwise.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean getCopyOnRead();
 
@@ -89,7 +89,7 @@ public interface GemFireCache extends RegionService {
    *
    * @see #setRegionAttributes
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public <K,V> RegionAttributes<K,V> getRegionAttributes(String id);
 
@@ -110,7 +110,7 @@ public interface GemFireCache extends RegionService {
    *
    * @see #getRegionAttributes
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public <K,V> void setRegionAttributes(String id, RegionAttributes<K,V> attrs);
 
@@ -119,7 +119,7 @@ public interface GemFireCache extends RegionService {
    * keys of the map are {@link String}s and the values of the map are
    * {@link RegionAttributes}.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public <K,V> Map<String, RegionAttributes<K,V>> listRegionAttributes();
 
@@ -143,7 +143,7 @@ public interface GemFireCache extends RegionService {
    *         the dtd or if an <code>IOException</code> occurs while
    *         reading the XML.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void loadCacheXml(InputStream is) 
     throws TimeoutException, CacheWriterException,
@@ -170,14 +170,14 @@ public interface GemFireCache extends RegionService {
    * Returns the DiskStore by name or <code>null</code> if no disk store is found.
    * @param name the name of the disk store to find. If <code>null</code> then the
    * default disk store, if it exists, is returned.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskStore findDiskStore(String name);
   
   /**
    * create diskstore factory 
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DiskStoreFactory createDiskStoreFactory();
   
@@ -188,7 +188,7 @@ public interface GemFireCache extends RegionService {
    * @see com.gemstone.gemfire.cache.CacheFactory#setPdxReadSerialized(boolean)
    * @see com.gemstone.gemfire.cache.client.ClientCacheFactory#setPdxReadSerialized(boolean)
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public boolean getPdxReadSerialized();
   
@@ -196,7 +196,7 @@ public interface GemFireCache extends RegionService {
    * Returns the PdxSerializer used by this cache, or null
    * if no PDX serializer is defined.
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    * @see CacheFactory#setPdxSerializer(PdxSerializer)
    * @see ClientCacheFactory#setPdxSerializer(PdxSerializer)
    */
@@ -204,7 +204,7 @@ public interface GemFireCache extends RegionService {
   
   /**
    * Returns the disk store used for PDX meta data
-   * @since 6.6
+   * @since GemFire 6.6
    * @see CacheFactory#setPdxDiskStore(String)
    * @see ClientCacheFactory#setPdxDiskStore(String)
    */
@@ -213,7 +213,7 @@ public interface GemFireCache extends RegionService {
   /**
    * Returns true if the PDX metadata for this
    * cache is persistent
-   * @since 6.6
+   * @since GemFire 6.6
    * @see CacheFactory#setPdxPersistent(boolean)
    * @see ClientCacheFactory#setPdxPersistent(boolean)
    */
@@ -221,7 +221,7 @@ public interface GemFireCache extends RegionService {
   /**
    * Returns true if fields that are not read during PDX deserialization
    * should be ignored during the PDX serialization.
-   * @since 6.6
+   * @since GemFire 6.6
    * @see CacheFactory#setPdxIgnoreUnreadFields(boolean)
    * @see ClientCacheFactory#setPdxIgnoreUnreadFields(boolean)
    */
@@ -233,7 +233,7 @@ public interface GemFireCache extends RegionService {
    *
    * @throws CacheClosedException if the cache is closed.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public CacheTransactionManager getCacheTransactionManager();
   /**
@@ -241,21 +241,21 @@ public interface GemFireCache extends RegionService {
    * @return javax.naming.Context
    * Added as part of providing JTA implementation in Gemfire.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Context getJNDIContext();
 
   /**
    * Returns the Declarable used to initialize this cache or <code>null</code>
    * if it does not have an initializer.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Declarable getInitializer();
 
   /**
    * Returns the Properties used to initialize the cache initializer or
    * <code>null</code> if no initializer properties exist.
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public Properties getInitializerProps();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/IncompatibleVersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/IncompatibleVersionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/IncompatibleVersionException.java
index 6730b12..7f76bd9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/IncompatibleVersionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/IncompatibleVersionException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache;
  * An <code>IncompatibleVersionException</code> that the client version
  * was not compatible with the server version.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class IncompatibleVersionException extends VersionException {
 private static final long serialVersionUID = 668812986092856749L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestPolicy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestPolicy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestPolicy.java
index dbe7337..7200bc6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestPolicy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestPolicy.java
@@ -28,7 +28,7 @@ import java.io.*;
  *
  * @see SubscriptionAttributes
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class InterestPolicy implements java.io.Serializable {
   private static final long serialVersionUID = 1567179436331385968L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationEvent.java
index df0c4ff..b2f9b0a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationEvent.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.tier.InterestType;
  * Interface <code>InterestRegistrationEvent</code> encapsulated interest
  * event information like region and keys of interest.
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface InterestRegistrationEvent {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationListener.java
index 714be3f..370d47b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestRegistrationListener.java
@@ -60,7 +60,7 @@ package com.gemstone.gemfire.cache;
  * </pre>
  *
  *
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see com.gemstone.gemfire.cache.server.CacheServer#registerInterestRegistrationListener registerInterestRegistrationListener
  * @see com.gemstone.gemfire.cache.server.CacheServer#unregisterInterestRegistrationListener unregisterInterestRegistrationListener

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestResultPolicy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestResultPolicy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestResultPolicy.java
index abfdc8b..7dee649 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestResultPolicy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/InterestResultPolicy.java
@@ -31,7 +31,7 @@ import java.io.Serializable;
  * @see com.gemstone.gemfire.cache.Region#registerInterest(Object)
  * @see com.gemstone.gemfire.cache.Region#registerInterestRegex(String)
  *
- * @since 4.2.3
+ * @since GemFire 4.2.3
  */
 public class InterestResultPolicy implements Serializable {
   private static final long serialVersionUID = -4993765891973030160L;
@@ -73,7 +73,7 @@ public class InterestResultPolicy implements Serializable {
     return VALUES[ordinal];
   }
   /** Returns the ordinal value.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public byte getOrdinal() {
     return this.ordinal;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/LoaderHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/LoaderHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/LoaderHelper.java
index 79dabe3..86aa329 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/LoaderHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/LoaderHelper.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache;
  *
  *
  * @see CacheLoader#load(LoaderHelper) load
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface LoaderHelper<K,V>
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java
index e2f3748..aee073a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/LowMemoryException.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * @see ResourceManager#setCriticalHeapPercentage(float)
  * @see Region#put(Object, Object)
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class LowMemoryException extends ResourceException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/MirrorType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/MirrorType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/MirrorType.java
index a499958..76b34a8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/MirrorType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/MirrorType.java
@@ -29,7 +29,7 @@ import java.io.*;
  *
  * @deprecated as of GemFire 5.0, use {@link DataPolicy} instead.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @Deprecated
 public class MirrorType implements java.io.Serializable {
@@ -97,7 +97,7 @@ public class MirrorType implements java.io.Serializable {
 
     /**
      * Returns the {@link DataPolicy} that corresponds to this mirror type.
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public DataPolicy getDataPolicy() {
       return this.dataPolicy;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/NoQueueServersAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/NoQueueServersAvailableException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/NoQueueServersAvailableException.java
index c63605c..0217e91 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/NoQueueServersAvailableException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/NoQueueServersAvailableException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.client.ServerConnectivityException;
  * Indicates that this client cannot contact any queue servers and
  * therefore cannot perform operations that require a queue, such as
  * registering interest.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class NoQueueServersAvailableException extends ServerConnectivityException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/NoSubscriptionServersAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/NoSubscriptionServersAvailableException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/NoSubscriptionServersAvailableException.java
index 9ececa0..9c72e44 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/NoSubscriptionServersAvailableException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/NoSubscriptionServersAvailableException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.client.ServerConnectivityException;
  * Indicates that this client cannot contact any servers and
  * therefore cannot perform operations that require subscriptions, such as
  * registering interest.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class NoSubscriptionServersAvailableException extends ServerConnectivityException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/Operation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/Operation.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/Operation.java
index a104751..2634416 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/Operation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/Operation.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
  *
  * @see CacheEvent#getOperation
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class Operation implements java.io.Serializable {
   private static final long serialVersionUID = -7521751729852504238L;
@@ -613,7 +613,7 @@ public final class Operation implements java.io.Serializable {
   /**
    * An atomic entry creation operation
    * @see java.util.concurrent.ConcurrentMap#putIfAbsent(Object, Object)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final Operation PUT_IF_ABSENT
     = new Operation("PUT_IF_ABSENT",
@@ -626,7 +626,7 @@ public final class Operation implements java.io.Serializable {
   /**
    * An atomic update operation 
    * @see java.util.concurrent.ConcurrentMap#replace(Object, Object, Object)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final Operation REPLACE
     = new Operation("REPLACE",
@@ -638,7 +638,7 @@ public final class Operation implements java.io.Serializable {
   /**
    * An atomic destroy destroy operation
    * @see java.util.concurrent.ConcurrentMap#remove(Object, Object)
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final Operation REMOVE
     = new Operation("REMOVE",
@@ -662,7 +662,7 @@ public final class Operation implements java.io.Serializable {
   /**
    * An entry distributed destroy caused by a removeAll.
    * @see Region#removeAll(java.util.Collection)
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final Operation REMOVEALL_DESTROY
     = new Operation("REMOVEALL_DESTROY",
@@ -821,7 +821,7 @@ public final class Operation implements java.io.Serializable {
   /**
    * Returns true if this operation was initiated by a removeAll.
    * @see Region#removeAll(java.util.Collection)
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public boolean isRemoveAll() {
     return (this.opDetails & OP_DETAILS_REMOVEALL) != 0;
@@ -932,7 +932,7 @@ public final class Operation implements java.io.Serializable {
    * guarantees the old value to be returned no matter what expense may
    * be incurred in doing so.
    * @return true if this operation has this guarantee
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean guaranteesOldValue() {
     return (this.opDetails & OP_DETAILS_GUARANTEES_OLD_VALUE) != 0;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/OperationAbortedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/OperationAbortedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/OperationAbortedException.java
index f74763a..f596f7e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/OperationAbortedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/OperationAbortedException.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache;
  *
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class OperationAbortedException extends CacheRuntimeException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributes.java
index ef6315f..e2f5479 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributes.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.partition.PartitionListener;
  *
  * Also see {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}.
  * 
- * @since 5.0
+ * @since GemFire 5.0
  * 
  */
 public interface PartitionAttributes<K,V>
@@ -97,7 +97,7 @@ public interface PartitionAttributes<K,V>
   
   /**
    * Returns name of the colocated PartitionedRegion's name 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public String getColocatedWith();
 
@@ -124,7 +124,7 @@ public interface PartitionAttributes<K,V>
   /**
    * Returns the PartitionResolver set for custom partitioning
    * @return <code>PartitionResolver</code> for the PartitionedRegion
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public PartitionResolver<K,V> getPartitionResolver();
 
@@ -135,7 +135,7 @@ public interface PartitionAttributes<K,V>
    * Default value of recoveryDelay is -1 which indicates that redundancy won't 
    * be recovered if a member crashes.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public long getRecoveryDelay();
 
@@ -146,7 +146,7 @@ public interface PartitionAttributes<K,V>
    * Default value is 0 which is to recover redundancy immediately when a new
    * member is added. 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public long getStartupRecoveryDelay();
   
@@ -155,7 +155,7 @@ public interface PartitionAttributes<K,V>
    * 
    * @see PartitionListener
    * @return PartitionListener configured on this partitioned region
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PartitionListener[] getPartitionListeners();
 
@@ -163,7 +163,7 @@ public interface PartitionAttributes<K,V>
    * Returns <code>FixedPartitionAttributes</code>'s list of local partitions
    * defined on this Partitioned Region
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public List<FixedPartitionAttributes> getFixedPartitionAttributes();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributesFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributesFactory.java
index 1e35739..7489b89 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributesFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionAttributesFactory.java
@@ -68,7 +68,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * 
  * @see com.gemstone.gemfire.cache.PartitionAttributes
  * @see com.gemstone.gemfire.cache.AttributesFactory#setPartitionAttributes(PartitionAttributes)
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class PartitionAttributesFactory<K,V>
 {
@@ -264,7 +264,7 @@ public class PartitionAttributesFactory<K,V>
    * Default value is set to -1 which indicates
    * that redundancy will not be recovered after a failure.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public PartitionAttributesFactory<K,V> setRecoveryDelay(long recoveryDelay) {
     this.partitionAttributes.setRecoveryDelay(recoveryDelay);
@@ -278,7 +278,7 @@ public class PartitionAttributesFactory<K,V>
    * The default (set to 0) is to recover redundancy immediately when a new
    * member is added. 
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public PartitionAttributesFactory<K,V> setStartupRecoveryDelay(long startupRecoveryDelay) {
     this.partitionAttributes.setStartupRecoveryDelay(startupRecoveryDelay);
@@ -290,7 +290,7 @@ public class PartitionAttributesFactory<K,V>
    * 
    * @param listener
    * @return PartitionAttributeFactory
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PartitionAttributesFactory<K, V> addPartitionListener(
       PartitionListener listener) {
@@ -349,7 +349,7 @@ public class PartitionAttributesFactory<K,V>
    * FixedPartitionAttributes defined for this partitioned region is added to
    * PR attributes.
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public PartitionAttributesFactory<K, V> addFixedPartitionAttributes(
       FixedPartitionAttributes fpa) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
index ec4e821..562a42b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionResolver.java
@@ -57,7 +57,7 @@ package com.gemstone.gemfire.cache;
  * </p>
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface PartitionResolver<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/PartitionedRegionDistributionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionDistributionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionDistributionException.java
index dff7872..9a3ed77 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionDistributionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionDistributionException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache;
  * Indicates a failure to perform a distributed operation on a Partitioned Region 
  * after multiple attempts.
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class PartitionedRegionDistributionException extends
    CacheRuntimeException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionStorageException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionStorageException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionStorageException.java
index bfa1836..7334f89 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionStorageException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/PartitionedRegionStorageException.java
@@ -66,7 +66,7 @@ package com.gemstone.gemfire.cache;
  * 
  * 
  * @see com.gemstone.gemfire.cache.PartitionAttributesFactory
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class PartitionedRegionStorageException extends CacheRuntimeException  {
 private static final long serialVersionUID = 5905463619475329732L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/Region.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/Region.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/Region.java
index 80e6ac9..f70e5de 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/Region.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/Region.java
@@ -151,7 +151,7 @@ import com.gemstone.gemfire.cache.snapshot.RegionSnapshotService;
  * @see AttributesFactory
  * @see AttributesMutator
  * @see Region.Entry
- * @since 2.0
+ * @since GemFire 2.0
  */
 
 public interface Region<K,V>  extends ConcurrentMap<K, V> {
@@ -1126,7 +1126,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * Returns the <code>cache</code> associated with this region.
    *  <p>Does not throw a <code>CacheClosedException</code> if the cache is closed.
    * @return the cache
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public RegionService getRegionService();
   
@@ -1256,7 +1256,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *         If problems are encounter while writing to disk
    * @throws UnsupportedOperationException If the region is a partitioned region
    * @see AttributesFactory#setPersistBackup
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated use {@link DiskStore#flush} instead.
    */
   @Deprecated
@@ -1282,7 +1282,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see QueryService
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean existsValue(String queryPredicate)
   throws FunctionDomainException, TypeMismatchException, NameResolutionException,
@@ -1312,7 +1312,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see QueryService
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public <E> SelectResults<E> query(String queryPredicate)
   throws FunctionDomainException, TypeMismatchException, NameResolutionException,
@@ -1340,7 +1340,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *         If more than one element evaluates to true.
    *
    * @see QueryService
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Object selectValue(String queryPredicate)
   throws FunctionDomainException, TypeMismatchException, NameResolutionException,
@@ -1355,7 +1355,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * thrown. If compaction is true, the application will wait for the other oplogs to be compressed and more
    * space to be created.
    *
-   * @since 5.1
+   * @since GemFire 5.1
    * @throws DiskAccessException
    * @deprecated use {@link DiskStore#forceRoll} instead.
    */
@@ -1388,7 +1388,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @throws IllegalStateException if scope is not GLOBAL
    * @throws UnsupportedOperationException If the region is a partitioned region
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void becomeLockGrantor();
 
@@ -1396,7 +1396,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * Removes all local entries from this region. This is not a distributed operation.
    * This operation is not allowed on replicated regions.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @throws UnsupportedOperationException  If the region is a replicated region
    * @throws UnsupportedOperationException  If the region is a partitioned region
    * @see CacheListener#afterRegionClear
@@ -1409,7 +1409,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * Removes all entries from this region. Clear will be distributed to other caches if the scope
    * is not <code>Scope.LOCAL</code>.
    * <p>
-   * @since 5.0
+   * @since GemFire 5.0
    * @see java.util.Map#clear()
    * @see CacheListener#afterRegionClear
    * @see CacheWriter#beforeRegionClear
@@ -1424,7 +1424,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * This operation is not distributed and only the current region will be
    * checked for this value.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @see java.util.Map#containsValue(Object)
    */
   public boolean containsValue(Object value);
@@ -1448,14 +1448,14 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *  that entry is called, it will be similar in effect as calling a put on that key.
    *
    * @return a Set of all the Region.Entry instances in this region locally
-   * @since 5.0
+   * @since GemFire 5.0
    * @see java.util.Map#entrySet()
    */
   public Set<Map.Entry<K,V>> entrySet(); //@todo darrel: should be Region.Entry
 
   /**
    * Returns true if this region contains no entries.
-   *@since 5.0
+   *@since GemFire 5.0
    * @see java.util.Map#isEmpty()
    * @return true if this region contains no entries.
    */
@@ -1468,7 +1468,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * This operation will be distributed to other caches if the scope
    * is not <code>Scope.LOCAL</code>.
    * @param map the key/value pairs to put in this region.
-   * @since 5.0
+   * @since GemFire 5.0
    * @see java.util.Map#putAll(Map map)
    * @throws LowMemoryException if a low memory condition is detected.
    */
@@ -1483,7 +1483,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @param map the key/value pairs to put in this region.
    * @param aCallbackArgument a user-defined parameter to pass to callback events
    *        triggered by this method. May be null. Must be serializable if this operation is distributed.
-   * @since 8.1
+   * @since GemFire 8.1
    * @see java.util.Map#putAll(Map map)
    * @throws LowMemoryException if a low memory condition is detected.
    */
@@ -1497,7 +1497,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * This operation will be distributed to other caches if the scope
    * is not <code>Scope.LOCAL</code>.
    * @param keys the keys to remove from this region.
-   * @since 8.1
+   * @since GemFire 8.1
    * @see Region#destroy(Object)
    */
   public void removeAll(Collection<? extends K> keys);
@@ -1511,7 +1511,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @param keys the keys to remove from this region.
    * @param aCallbackArgument a user-defined parameter to pass to callback events
    *        triggered by this method. May be null. Must be serializable if this operation is distributed.
-   * @since 8.1
+   * @since GemFire 8.1
    * @see Region#destroy(Object, Object)
    */
   public void removeAll(Collection<? extends K> keys, Object aCallbackArgument);
@@ -1527,7 +1527,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @param keys A Collection of keys
    * @return A Map of values for the input keys
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public Map<K, V> getAll(Collection<?> keys);
   /**
@@ -1546,7 +1546,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * May be null. Must be serializable if this operation is distributed.
    * @return A Map of values for the input keys
    *
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public <T extends K> Map<T, V> getAll(Collection<T> keys, Object aCallbackArgument);
 
@@ -1582,7 +1582,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see CacheWriter#beforeDestroy
    * @see java.util.Map#remove(Object)
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public V remove(Object key);
 
@@ -1595,7 +1595,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * For all other types of regions, it returns the number of entries present
    * locally, and it is not a distributed operation.
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    * @see java.util.Map#size()
    * @return int the number of entries present in this region
    */
@@ -1649,7 +1649,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * 
    * @see InterestResultPolicy
    *
-   * @since 4.2
+   * @since GemFire 4.2
    *
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    * @throws SubscriptionNotEnabledException if the region's pool does not have subscriptions enabled.
@@ -1696,7 +1696,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see InterestResultPolicy
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void registerInterest(K key, InterestResultPolicy policy);
 
@@ -1727,7 +1727,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void registerInterestRegex(String regex);
 
@@ -1763,7 +1763,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void registerInterestRegex(String regex, InterestResultPolicy policy);
 
@@ -1778,7 +1778,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * be unregistered.
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    *
-   * @since 4.2
+   * @since GemFire 4.2
    */
   public void unregisterInterest(K key);
 
@@ -1792,7 +1792,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @param regex The regular expression on which to unregister interest.
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public void unregisterInterestRegex(String regex);
   /**
@@ -1803,7 +1803,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @return The list of keys on which this client is interested
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    *
-   * @since 4.2
+   * @since GemFire 4.2
    */
   public List<K> getInterestList();
 
@@ -1839,7 +1839,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see InterestResultPolicy
    *
-   * @since 5.5
+   * @since GemFire 5.5
    *
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    * @throws SubscriptionNotEnabledException if the region's pool does not have subscriptions enabled.
@@ -1881,7 +1881,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see InterestResultPolicy
    *
-   * @since 6.0.3
+   * @since GemFire 6.0.3
    *
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    * @throws SubscriptionNotEnabledException if the region's pool does not have subscriptions enabled.
@@ -1932,7 +1932,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see InterestResultPolicy
    *
-   * @since 6.0.3
+   * @since GemFire 6.0.3
    */
   public void registerInterest(K key, InterestResultPolicy policy,
       boolean isDurable, boolean receiveValues);
@@ -1978,7 +1978,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    *
    * @see InterestResultPolicy
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void registerInterest(K key, InterestResultPolicy policy, boolean isDurable);
   
@@ -2011,7 +2011,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void registerInterestRegex(String regex, boolean isDurable);
 
@@ -2046,7 +2046,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 6.0.3
+   * @since GemFire 6.0.3
    */
   public void registerInterestRegex(String regex, boolean isDurable,
       boolean receiveValues);
@@ -2085,7 +2085,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public void registerInterestRegex(String regex, InterestResultPolicy policy, boolean isDurable);
 
@@ -2125,7 +2125,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @see InterestResultPolicy
    * @see java.util.regex.Pattern
    *
-   * @since 6.0.3
+   * @since GemFire 6.0.3
    */
   public void registerInterestRegex(String regex, InterestResultPolicy policy,
       boolean isDurable, boolean receiveValues);
@@ -2138,7 +2138,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
    * @return The list of regular expresssions on which this client is interested
    * @throws UnsupportedOperationException if the region is not configured with a pool name.
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public List<String> getInterestListRegex();
 
@@ -2147,7 +2147,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
   * @return a Set of all the keys in the region on the server
   * @throws UnsupportedOperationException if the region is not configured with a pool name.
   *
-  * @since 5.0.2
+  * @since GemFire 5.0.2
   */
  public Set<K> keySetOnServer();
 
@@ -2159,7 +2159,7 @@ public interface Region<K,V>  extends ConcurrentMap<K, V> {
   * the server
   * @throws UnsupportedOperationException if the region is not configured with a pool name.
   *
-  * @since 5.0.2
+  * @since GemFire 5.0.2
   */
 public boolean containsKeyOnServer(Object key);
 
@@ -2198,7 +2198,7 @@ public boolean containsKeyOnServer(Object key);
    * @throws CacheWriterException if a CacheWriter aborts the operation
    * @throws PartitionedRegionStorageException if the operation could not be completed on a partitioned region.
    * @throws LowMemoryException if a low memory condition is detected.
-   * @since 6.5
+   * @since GemFire 6.5
   *
   */
  V putIfAbsent(K key, V value);
@@ -2232,7 +2232,7 @@ public boolean containsKeyOnServer(Object key);
    * @throws CacheWriterException if a CacheWriter aborts the operation
    * @throws PartitionedRegionStorageException if the operation could not be completed on a partitioned region.
    * @throws LowMemoryException if a low memory condition is detected.
-   * @since 6.5
+   * @since GemFire 6.5
   */
  boolean remove(Object key, Object value);
 
@@ -2268,7 +2268,7 @@ public boolean containsKeyOnServer(Object key);
    * @throws CacheWriterException if a CacheWriter aborts the operation
    * @throws PartitionedRegionStorageException if the operation could not be completed on a partitioned region.
    * @throws LowMemoryException if a low memory condition is detected.
-   * @since 6.5
+   * @since GemFire 6.5
   */
  boolean replace(K key, V oldValue, V newValue);
 
@@ -2304,7 +2304,7 @@ public boolean containsKeyOnServer(Object key);
    * @throws CacheWriterException if a CacheWriter aborts the operation
    * @throws PartitionedRegionStorageException if the operation could not be completed on a partitioned region.
    * @throws LowMemoryException if a low memory condition is detected.
-   * @since 6.5
+   * @since GemFire 6.5
   */
  V replace(K key, V value);
 
@@ -2395,7 +2395,7 @@ public boolean containsKeyOnServer(Object key);
      *         If the value is not currently stored in memory but is on disk
      *         and if the region does not have cqs
      *         then <code>null</code> is returned.
-     * @since 5.0
+     * @since GemFire 5.0
      * @see Region#put(Object, Object)
      */
     public V setValue(V value);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
index 94cc11a..b0d09fa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionAttributes.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.compression.Compressor;
  * @see AttributesMutator
  * @see Region#getAttributes
  * @see com.gemstone.gemfire.cache.EvictionAttributes
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface RegionAttributes<K,V> {
 
@@ -112,7 +112,7 @@ public interface RegionAttributes<K,V> {
   /**
    * Gets the flag telling a region to ignore JTA transactions.
    * Default value is set to false.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public boolean getIgnoreJTA();
 
@@ -129,7 +129,7 @@ public interface RegionAttributes<K,V> {
    * Default value of DataPolicy is set to 'Normal'. Please refer the gemfire documentation for more details on this.
    *
    * @return the region's <code>DataPolicy</code>
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public DataPolicy getDataPolicy();
 
@@ -158,7 +158,7 @@ public interface RegionAttributes<K,V> {
   /** Returns an array of all the cache listeners on this attributes.
    * Modifications to the returned array will not effect the attributes.
    * @return the region's <code>CacheListener</code>s; an empty array if no listeners
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public CacheListener<K,V>[] getCacheListeners();
 
@@ -200,7 +200,7 @@ public interface RegionAttributes<K,V> {
    * Multicast must also be enabled in the DistributedSystem.
    * Default value is set to false.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @return true if this region is configured to allow use of multicast
    * for distributed messaging
    * @see AttributesFactory#setMulticastEnabled
@@ -218,7 +218,7 @@ public interface RegionAttributes<K,V> {
    * Returns whether or not a persistent backup should be made of the
    * region (as opposed to just writing the overflow data to disk).
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of GemFire 5.0, use {@link DataPolicy#PERSISTENT_REPLICATE} instead
    */
   @Deprecated
@@ -228,7 +228,7 @@ public interface RegionAttributes<K,V> {
    * Returns the <code>DiskWriteAttributes</code> that configure how
    * the region is written to disk.
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of 6.5 use {@link #getDiskStoreName} instead.
    */
   @Deprecated
@@ -239,7 +239,7 @@ public interface RegionAttributes<K,V> {
    * multiple directories are used, GemFire will attempt to distribute the
    * data evenly amongst them.
    *
-   * @since 3.2
+   * @since GemFire 3.2
    * @deprecated as of 6.5 use {@link DiskStore#getDiskDirs} instead.
    */
   @Deprecated
@@ -251,7 +251,7 @@ public interface RegionAttributes<K,V> {
    * region is modified or asynchronously in a background thread. 
    * Default value is true.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public boolean getIndexMaintenanceSynchronous();
 
@@ -259,7 +259,7 @@ public interface RegionAttributes<K,V> {
    * Returns the <code>PartitionAttributes</code> that configure how
    * the region is partitioned.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public PartitionAttributes getPartitionAttributes();
 
@@ -275,7 +275,7 @@ public interface RegionAttributes<K,V> {
    * Returns the <code>SubscriptionAttributes</code> that configure
    * how this region behaves as a subscriber to remote caches.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public SubscriptionAttributes getSubscriptionAttributes();
 
@@ -293,7 +293,7 @@ public interface RegionAttributes<K,V> {
    * @return True if acks are sent after updates are processed;
    *         false if acks are sent before updates are processed.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    * @deprecated Setting early ack no longer has any effect.
    */
   @Deprecated
@@ -305,7 +305,7 @@ public interface RegionAttributes<K,V> {
    * @return True if a publisher;
    *         false if not (default).
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    * @deprecated as of 6.5
    */
   public boolean getPublisher();
@@ -322,7 +322,7 @@ public interface RegionAttributes<K,V> {
    * @return True if conflation is enabled;
    *         false conflation is not enabled (default).
    *
-   * @since 4.2
+   * @since GemFire 4.2
    */
   @Deprecated
   public boolean getEnableConflation();
@@ -337,7 +337,7 @@ public interface RegionAttributes<K,V> {
    * @return True if conflation is enabled;
    *         false conflation is not enabled (default).
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated as of GemFire 5.0, use {@link #getEnableSubscriptionConflation} instead
    */
   @Deprecated
@@ -355,7 +355,7 @@ public interface RegionAttributes<K,V> {
    * @return True if conflation is enabled;
    *         false conflation is not enabled (default).
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public boolean getEnableSubscriptionConflation();
   /**
@@ -367,7 +367,7 @@ public interface RegionAttributes<K,V> {
    * @return True if async conflation is enabled;
    *         false async conflation is not enabled (default).
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   public boolean getEnableAsyncConflation();
 
@@ -386,7 +386,7 @@ public interface RegionAttributes<K,V> {
    * @return the name of the client-server {@link Pool}
    * this region will use for server communication; <code>null</code> is returned if
    * the region communicates with peers.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public String getPoolName();
   
@@ -397,7 +397,7 @@ public interface RegionAttributes<K,V> {
    * @return True if cloning is enabled;
    *         false cloning is not enabled (default).
    *
-   * @since 6.1
+   * @since GemFire 6.1
    */
   public boolean getCloningEnabled();
 
@@ -408,7 +408,7 @@ public interface RegionAttributes<K,V> {
    * @return the name of the {@link DiskStore} of this region; 
    * <code>null</code> is returned if this region belongs to default 
    * {@link DiskStore}.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public String getDiskStoreName();
   
@@ -417,7 +417,7 @@ public interface RegionAttributes<K,V> {
    * Default is set to true.
    * 
    * @return Returns true if writes to disk are synchronous and false otherwise
-   * @since 6.5 
+   * @since GemFire 6.5
    */
   public boolean isDiskSynchronous();
   
@@ -441,14 +441,14 @@ public interface RegionAttributes<K,V> {
    * 
    * Default is set to true.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    * @return true if concurrent update checks are turned on
    */
   public boolean getConcurrencyChecksEnabled();
   
   /**
    * Returns the compressor used by this region's entry values.
-   * @since 8.0
+   * @since GemFire 8.0
    * @return null if the region does not have compression enabled.
    */
   public Compressor getCompressor();
@@ -457,7 +457,7 @@ public interface RegionAttributes<K,V> {
    * Returns whether or not this region uses off-heap memory.
    * @return True if a usage of off-heap memory is enabled;
    *         false if usage of off-heap memory is disabled (default).
-   * @since 9.0
+   * @since Geode 1.0
    */
   public boolean getOffHeap();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDestroyedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDestroyedException.java
index 25c6d23..e518444 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDestroyedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionDestroyedException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  * on the region object are not allowed.
  *
  *
- * @since 2.0
+ * @since GemFire 2.0
  */
 public class RegionDestroyedException extends CacheRuntimeException {
 private static final long serialVersionUID = 319804842308010754L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionEvent.java
index d15ee89..08365d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionEvent.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.cache;
  * @see CacheListener
  * @see CacheWriter
  * @see EntryEvent
- * @since 2.0
+ * @since GemFire 2.0
  */
 public interface RegionEvent<K,V> extends CacheEvent<K,V> {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionExistsException.java
index a4ced6f..91225ec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionExistsException.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.cache;
  * 
  * @see Region#createSubregion
  * @see Cache#createRegion
- * @since 2.0
+ * @since GemFire 2.0
  */
 public class RegionExistsException extends CacheException {
 private static final long serialVersionUID = -5643670216230359426L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
index 5110d40..3fd383a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
@@ -57,7 +57,7 @@ The final step is to produce a {@link Region} by calling {@link #create(String)}
     .create("partition");
 </PRE>
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 
 public class RegionFactory<K,V>
@@ -67,7 +67,7 @@ public class RegionFactory<K,V>
 
   /**
    * For internal use only.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected RegionFactory(GemFireCacheImpl cache) {
     this.cache = cache;
@@ -76,7 +76,7 @@ public class RegionFactory<K,V>
 
   /**
    * For internal use only.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected RegionFactory(GemFireCacheImpl cache, RegionShortcut pra) {
     this.cache = cache;
@@ -90,7 +90,7 @@ public class RegionFactory<K,V>
 
   /**
    * For internal use only.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected RegionFactory(GemFireCacheImpl cache, RegionAttributes ra) {
     this.cache = cache;
@@ -99,7 +99,7 @@ public class RegionFactory<K,V>
 
   /**
    * For internal use only.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   protected RegionFactory(GemFireCacheImpl cache, String regionAttributesId) {
     this.cache = cache;
@@ -449,7 +449,7 @@ public class RegionFactory<K,V>
   /**
    * Sets whether distributed operations on this region should attempt to use multicast.
    *
-   * @since 5.0
+   * @since GemFire 5.0
    * @param value true to enable multicast
    * @return a reference to this RegionFactory object
    * @see AttributesFactory#setMulticastEnabled(boolean)
@@ -476,7 +476,7 @@ public class RegionFactory<K,V>
    * @return a reference to this RegionFactory object
    * @throws IllegalStateException if a cache loader or cache writer has already
    * been set.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public RegionFactory<K,V> setPoolName(String poolName) {
     this.attrsFactory.setPoolName(poolName);
@@ -485,7 +485,7 @@ public class RegionFactory<K,V>
 
   /**
    * Sets whether or not this region should be considered a publisher.
-   * @since 5.0
+   * @since GemFire 5.0
    * @deprecated as of 6.5
    */
   @Deprecated
@@ -613,7 +613,7 @@ public class RegionFactory<K,V>
    * ensures that region contents are consistent across the distributed
    * system.  This setting must be the same in each member having the region.
    *
-   * @since 7.0
+   * @since GemFire 7.0
    * @param enabled whether concurrency checks should be enabled for the region
    * @see AttributesFactory#setConcurrencyChecksEnabled
    */
@@ -644,7 +644,7 @@ public class RegionFactory<K,V>
    * This causes the region to belong to the DiskStore.
    * @param name the name of the diskstore
    * @return a reference to this RegionFactory object
-   * @since 6.5 
+   * @since GemFire 6.5
    * 
    * @see AttributesFactory#setDiskStoreName
    */
@@ -659,7 +659,7 @@ public class RegionFactory<K,V>
    * @param isSynchronous
    *          boolean if true indicates synchronous writes
    * @return a reference to this RegionFactory object
-   * @since 6.5 
+   * @since GemFire 6.5
    */
   public RegionFactory<K,V> setDiskSynchronous(boolean isSynchronous)
   {
@@ -691,7 +691,7 @@ public class RegionFactory<K,V>
    * @throws IllegalArgumentException if length of the size array
    * does not match to the length of the dir array
    *   
-   * @since 5.1
+   * @since GemFire 5.1
    * @see AttributesFactory#setDiskDirsAndSizes
    * @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirsAndSizes} instead
    */
@@ -758,7 +758,7 @@ public class RegionFactory<K,V>
   /**
    * Sets whether operations on this region should be controlled by
    * JTA transactions or not
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public RegionFactory<K,V> setIgnoreJTA(boolean flag) {
     this.attrsFactory.setIgnoreJTA(flag);
@@ -840,7 +840,7 @@ public class RegionFactory<K,V>
    *           if the parent region has been closed or destroyed
    * @throws CacheClosedException
    *           if the cache is closed
-   * @since 7.0
+   * @since GemFire 7.0
    */
   @SuppressWarnings("unchecked")
   public Region<K,V> createSubregion(Region<?,?> parent, String name) throws RegionExistsException {
@@ -854,7 +854,7 @@ public class RegionFactory<K,V>
    * Note: off-heap regions always behave as if cloning is enabled.
    * @param cloningEnable
    * @return a reference to this RegionFactory object
-   * @since 6.1
+   * @since GemFire 6.1
    * @see AttributesFactory#setCloningEnabled
    */
   public RegionFactory<K,V> setCloningEnabled(boolean cloningEnable) {
@@ -866,7 +866,7 @@ public class RegionFactory<K,V>
    * Adds a gatewaySenderId to the RegionAttributes
    * @param gatewaySenderId
    * @return a reference to this RegionFactory object
-   * @since 7.0
+   * @since GemFire 7.0
    * @see AttributesFactory#addGatewaySenderId(String) 
    */
   public RegionFactory<K,V> addGatewaySenderId(String gatewaySenderId)
@@ -880,7 +880,7 @@ public class RegionFactory<K,V>
    * 
    * @param asyncEventQueueId id of AsyncEventQueue 
    * @return a reference to this RegionFactory instance
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public RegionFactory<K,V> addAsyncEventQueueId(String asyncEventQueueId) {
     this.attrsFactory.addAsyncEventQueueId(asyncEventQueueId);
@@ -892,7 +892,7 @@ public class RegionFactory<K,V>
    * region entry values.
    * @param compressor a compressor
    * @return a reference to this RegionFactory instance
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public RegionFactory<K,V> setCompressor(Compressor compressor) {
     this.attrsFactory.setCompressor(compressor);
@@ -902,7 +902,7 @@ public class RegionFactory<K,V>
   /**
    * Enables this region's usage of off-heap memory if true.
    * @param offHeap boolean flag to enable off-heap memory
-   * @since 9.0
+   * @since Geode 1.0
    */
   public RegionFactory<K,V> setOffHeap(boolean offHeap) {
     this.attrsFactory.setOffHeap(offHeap);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionMembershipListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionMembershipListener.java
index 60f01cf..c4bd33e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionMembershipListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionMembershipListener.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * @see AttributesMutator#addCacheListener
  * @see AttributesMutator#removeCacheListener
  * @see AttributesMutator#initCacheListeners
- * @since 5.0
+ * @since GemFire 5.0
  */
 public interface RegionMembershipListener<K,V> extends CacheListener<K,V> {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionReinitializedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionReinitializedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionReinitializedException.java
index 029576c..48079ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionReinitializedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionReinitializedException.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache;
  * region.
  *
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class RegionReinitializedException extends RegionDestroyedException {
 private static final long serialVersionUID = 8532904304288670752L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionService.java
index 2afdd0e..186c41d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionService.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.pdx.PdxInstanceFactory;
  * </ul>
  * <p>
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public interface RegionService extends AutoCloseable {
   /**
@@ -96,7 +96,7 @@ public interface RegionService extends AutoCloseable {
    * @param className the fully qualified class name that the PdxInstance will become
    *   when it is fully deserialized.
    * @return the factory
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxInstanceFactory createPdxInstanceFactory(String className);
   /**
@@ -106,7 +106,7 @@ public interface RegionService extends AutoCloseable {
    * @param enumOrdinal the ordinal value of the enum constant
    * @return a PdxInstance that represents the enum value
    * @throws IllegalArgumentException if className or enumName are <code>null</code>.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxInstance createPdxEnum(String className, String enumName, int enumOrdinal);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionShortcut.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionShortcut.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionShortcut.java
index 6aae635..e9c5bb4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionShortcut.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RegionShortcut.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache;
  * <p>Another way to use predefined region attributes is in cache.xml by setting
  * the refid attribute on a region element or region-attributes element to the
  * string of each value.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public enum RegionShortcut {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/RemoteTransactionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/RemoteTransactionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/RemoteTransactionException.java
index bdfea22..060ffa5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/RemoteTransactionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/RemoteTransactionException.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache;
  * is hosted on a member that is not
  * the initiator of the transaction.
  *
- * @since 6.5
+ * @since GemFire 6.5
  * @deprecated as of 6.6 exceptions from a remote node are no longer wrapped in this exception.  Instead of this, {@link TransactionDataNodeHasDepartedException} is thrown.
  */
 public class RemoteTransactionException extends TransactionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/ResourceException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/ResourceException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/ResourceException.java
index 53983f0..8670f0d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/ResourceException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/ResourceException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  * A Generic exception to indicate that a resource exception has occurred.
  * This class is abstract so that only subclasses can be instantiated.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public abstract class ResourceException extends CacheRuntimeException {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/Scope.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/Scope.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/Scope.java
index 1affd0b..0ea7fa5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/Scope.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/Scope.java
@@ -29,7 +29,7 @@ import java.io.*;
  *
  * @see RegionAttributes#getScope
  * @see AttributesFactory#setScope
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class Scope implements Serializable {
     private static final long serialVersionUID = 5534399159504301602L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/SerializedCacheValue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/SerializedCacheValue.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/SerializedCacheValue.java
index e12076e..3976693 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/SerializedCacheValue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/SerializedCacheValue.java
@@ -32,7 +32,7 @@ package com.gemstone.gemfire.cache;
  * Attempts to access off-heap data from this event after it has expired will result in an
  * IllegalStateException.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface SerializedCacheValue<V> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/StatisticsDisabledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/StatisticsDisabledException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/StatisticsDisabledException.java
index f135b87..d2d4d35 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/StatisticsDisabledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/StatisticsDisabledException.java
@@ -27,7 +27,7 @@ package com.gemstone.gemfire.cache;
  * @see RegionAttributes#getStatisticsEnabled
  * @see Region#getStatistics
  * @see Region.Entry#getStatistics
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class StatisticsDisabledException extends CacheRuntimeException {
 private static final long serialVersionUID = -2987721454129719551L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/SubscriptionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/SubscriptionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/SubscriptionAttributes.java
index 2fb218b..2e10da8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/SubscriptionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/SubscriptionAttributes.java
@@ -26,7 +26,7 @@ import java.io.*;
  * <p>The {@link InterestPolicy} defines what remote operation's data/event
  * are of interest to this cache's region.</p>
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class SubscriptionAttributes implements DataSerializable, Externalizable {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/SynchronizationCommitConflictException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/SynchronizationCommitConflictException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/SynchronizationCommitConflictException.java
index 1870ddc..aea1f8f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/SynchronizationCommitConflictException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/SynchronizationCommitConflictException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache;
  *
  *
  * @see javax.transaction.UserTransaction#commit
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class SynchronizationCommitConflictException extends CacheRuntimeException {
 private static final long serialVersionUID = 2619806460255259492L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TimeoutException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TimeoutException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TimeoutException.java
index 0cdb912..f04f3d8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TimeoutException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TimeoutException.java
@@ -32,7 +32,7 @@ package com.gemstone.gemfire.cache;
  * @see com.gemstone.gemfire.cache.Region#invalidate(Object)
  * @see com.gemstone.gemfire.cache.Region#destroy(Object)
  * @see com.gemstone.gemfire.distributed.DistributedLockService
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class TimeoutException extends OperationAbortedException {
 private static final long serialVersionUID = -6260761691185737442L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNodeHasDepartedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNodeHasDepartedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNodeHasDepartedException.java
index f977694..40465f6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNodeHasDepartedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNodeHasDepartedException.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.cache;
  * is hosted on a member that is not
  * the initiator of the transaction.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class TransactionDataNodeHasDepartedException extends TransactionException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNotColocatedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNotColocatedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNotColocatedException.java
index 63535d7..09428af 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNotColocatedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataNotColocatedException.java
@@ -29,7 +29,7 @@ package com.gemstone.gemfire.cache;
  * is usually colocated. This is because data can be moved from one node to another
  * during the time between the original transactional operations and the commit. 
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class TransactionDataNotColocatedException extends TransactionException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataRebalancedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataRebalancedException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataRebalancedException.java
index 65b6a18..1d61b74 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataRebalancedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionDataRebalancedException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.control.RebalanceOperation;
  * <p>This exception only occurs when a transaction
  * involves partitioned regions.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class TransactionDataRebalancedException extends TransactionException {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionEvent.java
index e9cc4ee..5bf0c56 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionEvent.java
@@ -48,7 +48,7 @@ import java.util.*;
  *
  * @see TransactionListener
  * @see EntryEvent
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface TransactionEvent {
 
@@ -100,7 +100,7 @@ public interface TransactionEvent {
    * performed during the transaction.
    * @return an unmodifiable <code>List</code> of all the {@link CacheEvent} instances;
    * one for each operation performed by this transaction.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public List<CacheEvent<?,?>> getEvents();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionException.java
index 1212804..ef0999d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache;
 /**
  * This is the superclass for all Exceptions that may be thrown
  * by a GemFire transaction.
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class TransactionException extends CacheException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionId.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionId.java
index f05ab7e..230a649 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/TransactionId.java
@@ -23,7 +23,7 @@ import java.io.Externalizable;
  * represents a unique GemFire transaction.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see Cache#getCacheTransactionManager
  * @see CacheTransactionManager#getTransactionId



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

Posted by ja...@apache.org.
GEODE-1316: Changing @since tags to @GemFire or @Geode

* Modified existing @since tags that had 9.0 to @since Geode 1.0
* Modified existing @since 1.0 tags to @Geode 1.0 if appropriate
* Modified all other existing @since tags to @GemFire
* Fixed a comment with mispelling
* Changed 59poc and 57_maint tags to 5.9 and 5.7
* Changed a few 81_maint tags to 8.1


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8eac0fa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8eac0fa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8eac0fa8

Branch: refs/heads/develop
Commit: 8eac0fa8c70d615242f4c4af15506e3cdcda2dc4
Parents: 03246b4
Author: Jason Huynh <hu...@gmail.com>
Authored: Thu May 26 13:19:15 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Tue May 31 10:04:31 2016 -0700

----------------------------------------------------------------------
 .../modules/util/RegionConfiguration.java       |   2 +-
 .../LauncherLifecycleCommandsDUnitTest.java     |   2 +-
 ...auncherLifecycleCommandsIntegrationTest.java |   2 +-
 .../LauncherLifecycleCommandsJUnitTest.java     |   2 +-
 .../internal/web/RestInterfaceJUnitTest.java    |   2 +-
 .../rest/internal/web/controllers/Customer.java |   2 +-
 .../rest/internal/web/controllers/Gender.java   |   2 +-
 .../internal/web/controllers/GetAllEntries.java |   2 +-
 .../web/controllers/GetDeliveredOrders.java     |   2 +-
 .../internal/web/controllers/GetRegions.java    |   2 +-
 .../rest/internal/web/controllers/Item.java     |   2 +-
 .../rest/internal/web/controllers/Order.java    |   2 +-
 .../rest/internal/web/controllers/Person.java   |   2 +-
 ...stAPIOnRegionFunctionExecutionDUnitTest.java |   2 +-
 .../RestAPIsAndInterOpsDUnitTest.java           |   2 +-
 .../controllers/RestAPIsWithSSLDUnitTest.java   |   3 +-
 .../internal/web/controllers/RestTestUtils.java |   2 +-
 .../com/gemstone/gemfire/CancelCriterion.java   |   2 +-
 .../com/gemstone/gemfire/CancelException.java   |   2 +-
 .../gemstone/gemfire/CanonicalInstantiator.java |   4 +-
 .../com/gemstone/gemfire/CopyException.java     |   2 +-
 .../java/com/gemstone/gemfire/CopyHelper.java   |   6 +-
 .../com/gemstone/gemfire/DataSerializable.java  |   2 +-
 .../com/gemstone/gemfire/DataSerializer.java    |  86 ++++++-------
 .../main/java/com/gemstone/gemfire/Delta.java   |   2 +-
 .../gemfire/DeltaSerializationException.java    |   2 +-
 .../gemfire/ForcedDisconnectException.java      |   2 +-
 .../gemfire/GemFireCheckedException.java        |   2 +-
 .../gemstone/gemfire/GemFireRethrowable.java    |   2 +-
 .../java/com/gemstone/gemfire/Instantiator.java |   2 +-
 .../gemstone/gemfire/InternalGemFireError.java  |   2 +-
 .../gemstone/gemfire/InvalidDeltaException.java |   2 +-
 .../gemfire/SerializationException.java         |   2 +-
 .../gemstone/gemfire/StatisticDescriptor.java   |   2 +-
 .../java/com/gemstone/gemfire/Statistics.java   |   2 +-
 .../com/gemstone/gemfire/StatisticsFactory.java |   2 +-
 .../com/gemstone/gemfire/StatisticsType.java    |   2 +-
 .../gemstone/gemfire/StatisticsTypeFactory.java |   2 +-
 .../com/gemstone/gemfire/SystemFailure.java     |   4 +-
 .../com/gemstone/gemfire/ToDataException.java   |   2 +-
 .../gemfire/admin/AdminDistributedSystem.java   |  34 +++---
 .../admin/AdminDistributedSystemFactory.java    |   6 +-
 .../gemstone/gemfire/admin/AdminException.java  |   2 +-
 .../gemfire/admin/AdminXmlException.java        |   2 +-
 .../java/com/gemstone/gemfire/admin/Alert.java  |   2 +-
 .../com/gemstone/gemfire/admin/AlertLevel.java  |   2 +-
 .../gemstone/gemfire/admin/BackupStatus.java    |   2 +-
 .../admin/CacheDoesNotExistException.java       |   2 +-
 .../gemfire/admin/CacheHealthConfig.java        |   2 +-
 .../com/gemstone/gemfire/admin/CacheServer.java |   4 +-
 .../gemfire/admin/CacheServerConfig.java        |   2 +-
 .../com/gemstone/gemfire/admin/CacheVm.java     |   2 +-
 .../gemstone/gemfire/admin/CacheVmConfig.java   |   2 +-
 .../gemfire/admin/ConfigurationParameter.java   |   2 +-
 .../gemfire/admin/DistributedSystemConfig.java  |  36 +++---
 .../admin/DistributedSystemHealthConfig.java    |   2 +-
 .../gemfire/admin/DistributionLocator.java      |   4 +-
 .../admin/DistributionLocatorConfig.java        |   6 +-
 .../gemstone/gemfire/admin/GemFireHealth.java   |   2 +-
 .../gemfire/admin/GemFireHealthConfig.java      |   2 +-
 .../gemstone/gemfire/admin/ManagedEntity.java   |   2 +-
 .../gemfire/admin/ManagedEntityConfig.java      |   2 +-
 .../gemfire/admin/MemberHealthConfig.java       |   2 +-
 .../admin/OperationCancelledException.java      |   2 +-
 .../gemfire/admin/RegionNotFoundException.java  |   2 +-
 .../gemfire/admin/RegionSubRegionSnapshot.java  |   2 +-
 .../gemfire/admin/RuntimeAdminException.java    |   2 +-
 .../com/gemstone/gemfire/admin/Statistic.java   |   2 +-
 .../gemfire/admin/StatisticResource.java        |   4 +-
 .../gemstone/gemfire/admin/SystemMember.java    |   8 +-
 .../gemfire/admin/SystemMemberBridgeServer.java |  46 +++----
 .../gemfire/admin/SystemMemberCache.java        |  12 +-
 .../gemfire/admin/SystemMemberCacheEvent.java   |   2 +-
 .../admin/SystemMemberCacheListener.java        |   2 +-
 .../gemfire/admin/SystemMemberCacheServer.java  |  46 +++----
 .../gemfire/admin/SystemMemberRegion.java       |  12 +-
 .../gemfire/admin/SystemMemberRegionEvent.java  |   2 +-
 .../gemfire/admin/SystemMemberType.java         |   2 +-
 .../gemfire/admin/SystemMembershipEvent.java    |   4 +-
 .../gemfire/admin/SystemMembershipListener.java |   4 +-
 .../UnmodifiableConfigurationException.java     |   2 +-
 .../admin/internal/AbstractHealthEvaluator.java |   2 +-
 .../internal/AdminDistributedSystemImpl.java    |   8 +-
 .../admin/internal/CacheHealthConfigImpl.java   |   2 +-
 .../admin/internal/CacheHealthEvaluator.java    |   2 +-
 .../admin/internal/CacheServerConfigImpl.java   |   2 +-
 .../gemfire/admin/internal/CacheServerImpl.java |   4 +-
 .../internal/ConfigurationParameterImpl.java    |   2 +-
 .../ConfigurationParameterListener.java         |   2 +-
 .../internal/DistributedSystemConfigImpl.java   |  26 ++--
 .../DistributedSystemHealthConfigImpl.java      |   2 +-
 .../DistributedSystemHealthEvaluator.java       |   2 +-
 .../DistributedSystemHealthMonitor.java         |   2 +-
 .../internal/DistributionLocatorConfigImpl.java |   2 +-
 .../admin/internal/DistributionLocatorImpl.java |   4 +-
 .../EnabledManagedEntityController.java         |   2 +-
 .../admin/internal/GemFireHealthConfigImpl.java |   2 +-
 .../admin/internal/GemFireHealthEvaluator.java  |   2 +-
 .../admin/internal/GemFireHealthImpl.java       |   2 +-
 .../gemfire/admin/internal/InetAddressUtil.java |   2 +-
 .../admin/internal/InternalManagedEntity.java   |   2 +-
 .../admin/internal/ManagedEntityConfigImpl.java |   2 +-
 .../admin/internal/ManagedEntityConfigXml.java  |   2 +-
 .../ManagedEntityConfigXmlGenerator.java        |   2 +-
 .../internal/ManagedEntityConfigXmlParser.java  |   2 +-
 .../admin/internal/ManagedSystemMemberImpl.java |   2 +-
 .../admin/internal/MemberHealthConfigImpl.java  |   2 +-
 .../admin/internal/MemberHealthEvaluator.java   |   2 +-
 .../gemfire/admin/internal/StatisticImpl.java   |   2 +-
 .../admin/internal/StatisticResourceImpl.java   |   2 +-
 .../internal/SystemMemberBridgeServerImpl.java  |   2 +-
 .../internal/SystemMemberCacheEventImpl.java    |   2 +-
 .../SystemMemberCacheEventProcessor.java        |   2 +-
 .../admin/internal/SystemMemberCacheImpl.java   |   2 +-
 .../admin/internal/SystemMemberImpl.java        |   6 +-
 .../internal/SystemMemberRegionEventImpl.java   |   2 +-
 .../admin/internal/SystemMemberRegionImpl.java  |   4 +-
 .../internal/SystemMembershipEventImpl.java     |   4 +-
 .../com/gemstone/gemfire/admin/jmx/Agent.java   |   2 +-
 .../gemstone/gemfire/admin/jmx/AgentConfig.java |  10 +-
 .../gemfire/admin/jmx/AgentFactory.java         |   2 +-
 .../internal/AdminDistributedSystemJmxImpl.java |  28 ++---
 .../admin/jmx/internal/AgentConfigImpl.java     |   8 +-
 .../gemfire/admin/jmx/internal/AgentImpl.java   |   8 +-
 .../admin/jmx/internal/AgentLauncher.java       |   2 +-
 .../admin/jmx/internal/CacheServerJmxImpl.java  |   2 +-
 .../admin/jmx/internal/ConfigAttributeInfo.java |   2 +-
 .../internal/ConfigurationParameterJmxImpl.java |   2 +-
 .../DistributedSystemHealthConfigJmxImpl.java   |   2 +-
 .../admin/jmx/internal/DynamicManagedBean.java  |   4 +-
 .../internal/GemFireHealthConfigJmxImpl.java    |   2 +-
 .../jmx/internal/GemFireHealthJmxImpl.java      |   2 +-
 .../admin/jmx/internal/GenerateMBeanHTML.java   |   2 +-
 .../gemfire/admin/jmx/internal/MBeanUtil.java   |   2 +-
 .../jmx/internal/MX4JServerSocketFactory.java   |   2 +-
 .../gemfire/admin/jmx/internal/MailManager.java |   2 +-
 .../admin/jmx/internal/ManagedResource.java     |   2 +-
 .../admin/jmx/internal/ManagedResourceType.java |   2 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java  |   4 +-
 .../jmx/internal/RefreshNotificationType.java   |   2 +-
 .../jmx/internal/StatAlertNotification.java     |   2 +-
 .../jmx/internal/StatisticAttributeInfo.java    |   2 +-
 .../jmx/internal/StatisticResourceJmxImpl.java  |   2 +-
 .../SystemMemberBridgeServerJmxImpl.java        |   2 +-
 .../jmx/internal/SystemMemberCacheJmxImpl.java  |   8 +-
 .../admin/jmx/internal/SystemMemberJmx.java     |   2 +-
 .../admin/jmx/internal/SystemMemberJmxImpl.java |   4 +-
 .../jmx/internal/SystemMemberRegionJmxImpl.java |   2 +-
 .../gemfire/cache/AttributesFactory.java        |  56 ++++-----
 .../gemfire/cache/AttributesMutator.java        |  12 +-
 .../java/com/gemstone/gemfire/cache/Cache.java  |  48 ++++----
 .../gemstone/gemfire/cache/CacheCallback.java   |   2 +-
 .../gemfire/cache/CacheClosedException.java     |   2 +-
 .../com/gemstone/gemfire/cache/CacheEvent.java  |   8 +-
 .../gemstone/gemfire/cache/CacheException.java  |   2 +-
 .../gemfire/cache/CacheExistsException.java     |   4 +-
 .../gemstone/gemfire/cache/CacheFactory.java    |  22 ++--
 .../gemstone/gemfire/cache/CacheListener.java   |   8 +-
 .../com/gemstone/gemfire/cache/CacheLoader.java |   2 +-
 .../gemfire/cache/CacheLoaderException.java     |   2 +-
 .../gemfire/cache/CacheRuntimeException.java    |   2 +-
 .../gemstone/gemfire/cache/CacheStatistics.java |   2 +-
 .../gemfire/cache/CacheTransactionManager.java  |  38 +++---
 .../com/gemstone/gemfire/cache/CacheWriter.java |   2 +-
 .../gemfire/cache/CacheWriterException.java     |   2 +-
 .../gemfire/cache/CacheXmlException.java        |   2 +-
 .../gemstone/gemfire/cache/ClientSession.java   |  10 +-
 .../gemfire/cache/CommitConflictException.java  |   4 +-
 .../cache/CommitDistributionException.java      |   2 +-
 .../cache/CommitIncompleteException.java        |   2 +-
 .../com/gemstone/gemfire/cache/DataPolicy.java  |  10 +-
 .../com/gemstone/gemfire/cache/Declarable.java  |   2 +-
 .../gemfire/cache/DiskAccessException.java      |  12 +-
 .../com/gemstone/gemfire/cache/DiskStore.java   |   8 +-
 .../gemfire/cache/DiskStoreFactory.java         |   6 +-
 .../gemfire/cache/DiskWriteAttributes.java      |   2 +-
 .../cache/DiskWriteAttributesFactory.java       |   4 +-
 .../DuplicatePrimaryPartitionException.java     |   2 +-
 .../gemfire/cache/DynamicRegionFactory.java     |   4 +-
 .../gemfire/cache/DynamicRegionListener.java    |   2 +-
 .../gemfire/cache/EntryDestroyedException.java  |   2 +-
 .../com/gemstone/gemfire/cache/EntryEvent.java  |  14 +--
 .../gemfire/cache/EntryExistsException.java     |   4 +-
 .../gemfire/cache/EntryNotFoundException.java   |   2 +-
 .../gemstone/gemfire/cache/EntryOperation.java  |   6 +-
 .../gemstone/gemfire/cache/EvictionAction.java  |   4 +-
 .../gemfire/cache/EvictionAlgorithm.java        |   4 +-
 .../gemfire/cache/EvictionAttributes.java       |  12 +-
 .../cache/EvictionAttributesMutator.java        |   2 +-
 .../gemfire/cache/ExpirationAction.java         |   2 +-
 .../gemfire/cache/ExpirationAttributes.java     |   2 +-
 .../cache/FailedSynchronizationException.java   |   2 +-
 .../gemfire/cache/FixedPartitionAttributes.java |   2 +-
 .../gemfire/cache/FixedPartitionResolver.java   |   2 +-
 .../cache/GatewayConfigurationException.java    |   2 +-
 .../gemfire/cache/GatewayException.java         |   2 +-
 .../gemstone/gemfire/cache/GemFireCache.java    |  38 +++---
 .../cache/IncompatibleVersionException.java     |   2 +-
 .../gemstone/gemfire/cache/InterestPolicy.java  |   2 +-
 .../cache/InterestRegistrationEvent.java        |   2 +-
 .../cache/InterestRegistrationListener.java     |   2 +-
 .../gemfire/cache/InterestResultPolicy.java     |   4 +-
 .../gemstone/gemfire/cache/LoaderHelper.java    |   2 +-
 .../gemfire/cache/LowMemoryException.java       |   2 +-
 .../com/gemstone/gemfire/cache/MirrorType.java  |   4 +-
 .../cache/NoQueueServersAvailableException.java |   2 +-
 ...NoSubscriptionServersAvailableException.java |   2 +-
 .../com/gemstone/gemfire/cache/Operation.java   |  14 +--
 .../cache/OperationAbortedException.java        |   2 +-
 .../gemfire/cache/PartitionAttributes.java      |  14 +--
 .../cache/PartitionAttributesFactory.java       |  10 +-
 .../gemfire/cache/PartitionResolver.java        |   2 +-
 .../PartitionedRegionDistributionException.java |   2 +-
 .../PartitionedRegionStorageException.java      |   2 +-
 .../java/com/gemstone/gemfire/cache/Region.java |  88 +++++++-------
 .../gemfire/cache/RegionAttributes.java         |  48 ++++----
 .../gemfire/cache/RegionDestroyedException.java |   2 +-
 .../com/gemstone/gemfire/cache/RegionEvent.java |   2 +-
 .../gemfire/cache/RegionExistsException.java    |   2 +-
 .../gemstone/gemfire/cache/RegionFactory.java   |  38 +++---
 .../gemfire/cache/RegionMembershipListener.java |   2 +-
 .../cache/RegionReinitializedException.java     |   2 +-
 .../gemstone/gemfire/cache/RegionService.java   |   6 +-
 .../gemstone/gemfire/cache/RegionShortcut.java  |   2 +-
 .../cache/RemoteTransactionException.java       |   2 +-
 .../gemfire/cache/ResourceException.java        |   2 +-
 .../java/com/gemstone/gemfire/cache/Scope.java  |   2 +-
 .../gemfire/cache/SerializedCacheValue.java     |   2 +-
 .../cache/StatisticsDisabledException.java      |   2 +-
 .../gemfire/cache/SubscriptionAttributes.java   |   2 +-
 .../SynchronizationCommitConflictException.java |   2 +-
 .../gemfire/cache/TimeoutException.java         |   2 +-
 ...TransactionDataNodeHasDepartedException.java |   2 +-
 .../TransactionDataNotColocatedException.java   |   2 +-
 .../TransactionDataRebalancedException.java     |   2 +-
 .../gemfire/cache/TransactionEvent.java         |   4 +-
 .../gemfire/cache/TransactionException.java     |   2 +-
 .../gemstone/gemfire/cache/TransactionId.java   |   2 +-
 .../cache/TransactionInDoubtException.java      |   2 +-
 .../gemfire/cache/TransactionListener.java      |   2 +-
 .../gemfire/cache/TransactionWriter.java        |   2 +-
 .../cache/TransactionWriterException.java       |   2 +-
 ...upportedOperationInTransactionException.java |   2 +-
 .../cache/UnsupportedVersionException.java      |   2 +-
 .../gemfire/cache/VersionException.java         |   2 +-
 .../gemfire/cache/asyncqueue/AsyncEvent.java    |   2 +-
 .../cache/asyncqueue/AsyncEventListener.java    |   2 +-
 .../cache/asyncqueue/AsyncEventQueue.java       |   2 +-
 .../asyncqueue/AsyncEventQueueFactory.java      |   2 +-
 .../client/AllConnectionsInUseException.java    |   2 +-
 .../gemfire/cache/client/ClientCache.java       |   6 +-
 .../cache/client/ClientCacheFactory.java        |  12 +-
 .../cache/client/ClientNotReadyException.java   |   2 +-
 .../cache/client/ClientRegionFactory.java       |   8 +-
 .../cache/client/ClientRegionShortcut.java      |   2 +-
 .../client/NoAvailableLocatorsException.java    |   2 +-
 .../client/NoAvailableServersException.java     |   2 +-
 .../com/gemstone/gemfire/cache/client/Pool.java |   8 +-
 .../gemfire/cache/client/PoolFactory.java       |  10 +-
 .../gemfire/cache/client/PoolManager.java       |   2 +-
 .../client/ServerConnectivityException.java     |   2 +-
 .../cache/client/ServerOperationException.java  |   2 +-
 .../ServerRefusedConnectionException.java       |   2 +-
 .../client/SubscriptionNotEnabledException.java |   2 +-
 .../cache/client/internal/AbstractOp.java       |   2 +-
 .../cache/client/internal/AddPDXEnumOp.java     |   2 +-
 .../cache/client/internal/AddPDXTypeOp.java     |   2 +-
 .../client/internal/AuthenticateUserOp.java     |   2 +-
 .../internal/AutoConnectionSourceImpl.java      |   2 +-
 .../client/internal/CacheServerLoadMessage.java |   2 +-
 .../gemfire/cache/client/internal/ClearOp.java  |   2 +-
 .../client/internal/ClientMetadataService.java  |   2 +-
 .../client/internal/ClientPartitionAdvisor.java |   2 +-
 .../internal/ClientRegionFactoryImpl.java       |   2 +-
 .../client/internal/CloseConnectionOp.java      |   2 +-
 .../gemfire/cache/client/internal/CommitOp.java |   2 +-
 .../cache/client/internal/Connection.java       |   2 +-
 .../client/internal/ConnectionFactory.java      |   2 +-
 .../client/internal/ConnectionFactoryImpl.java  |   4 +-
 .../cache/client/internal/ConnectionImpl.java   |   2 +-
 .../cache/client/internal/ConnectionSource.java |   2 +-
 .../cache/client/internal/ConnectionStats.java  |   2 +-
 .../cache/client/internal/ContainsKeyOp.java    |   2 +-
 .../cache/client/internal/DestroyOp.java        |   2 +-
 .../cache/client/internal/DestroyRegionOp.java  |   2 +-
 .../gemfire/cache/client/internal/Endpoint.java |   2 +-
 .../cache/client/internal/ExecutablePool.java   |  16 +--
 .../client/internal/ExecuteFunctionNoAckOp.java |   2 +-
 .../client/internal/ExecuteFunctionOp.java      |   2 +-
 .../internal/ExecuteRegionFunctionNoAckOp.java  |   2 +-
 .../internal/ExecuteRegionFunctionOp.java       |   2 +-
 .../ExecuteRegionFunctionSingleHopOp.java       |   2 +-
 .../internal/ExplicitConnectionSourceImpl.java  |   2 +-
 .../gemfire/cache/client/internal/GetAllOp.java |   2 +-
 .../client/internal/GetClientPRMetaDataOp.java  |   2 +-
 .../GetClientPartitionAttributesOp.java         |   2 +-
 .../cache/client/internal/GetEventValueOp.java  |   2 +-
 .../gemfire/cache/client/internal/GetOp.java    |   2 +-
 .../cache/client/internal/GetPDXEnumByIdOp.java |   2 +-
 .../cache/client/internal/GetPDXEnumsOp.java    |   2 +-
 .../client/internal/GetPDXIdForEnumOp.java      |   2 +-
 .../client/internal/GetPDXIdForTypeOp.java      |   2 +-
 .../cache/client/internal/GetPDXTypeByIdOp.java |   2 +-
 .../cache/client/internal/GetPDXTypesOp.java    |   2 +-
 .../cache/client/internal/InternalPool.java     |   2 +-
 .../cache/client/internal/InvalidateOp.java     |   2 +-
 .../gemfire/cache/client/internal/KeySetOp.java |   2 +-
 .../internal/LocatorDiscoveryCallback.java      |   2 +-
 .../LocatorDiscoveryCallbackAdapter.java        |   2 +-
 .../cache/client/internal/MakePrimaryOp.java    |   2 +-
 .../gemfire/cache/client/internal/Op.java       |   2 +-
 .../cache/client/internal/OpExecutorImpl.java   |   2 +-
 .../gemfire/cache/client/internal/PingOp.java   |   2 +-
 .../gemfire/cache/client/internal/PoolImpl.java |  22 ++--
 .../cache/client/internal/PrimaryAckOp.java     |   2 +-
 .../cache/client/internal/ProxyCache.java       |   2 +-
 .../cache/client/internal/ProxyRegion.java      |   2 +-
 .../gemfire/cache/client/internal/PutAllOp.java |   2 +-
 .../gemfire/cache/client/internal/PutOp.java    |   6 +-
 .../gemfire/cache/client/internal/QueryOp.java  |   2 +-
 .../cache/client/internal/QueueManager.java     |   2 +-
 .../cache/client/internal/QueueManagerImpl.java |   2 +-
 .../cache/client/internal/QueueStateImpl.java   |   4 +-
 .../cache/client/internal/ReadyForEventsOp.java |   2 +-
 .../internal/RegisterInstantiatorsOp.java       |   2 +-
 .../client/internal/RegisterInterestListOp.java |   2 +-
 .../client/internal/RegisterInterestOp.java     |   2 +-
 .../internal/RegisterInterestTracker.java       |   4 +-
 .../cache/client/internal/RemoveAllOp.java      |   2 +-
 .../cache/client/internal/RollbackOp.java       |   2 +-
 .../cache/client/internal/ServerProxy.java      |   2 +-
 .../client/internal/ServerRegionProxy.java      |   2 +-
 .../gemfire/cache/client/internal/SizeOp.java   |   2 +-
 .../cache/client/internal/TXFailoverOp.java     |   2 +-
 .../internal/UnregisterInterestListOp.java      |   2 +-
 .../client/internal/UnregisterInterestOp.java   |   2 +-
 .../internal/locator/LocatorStatusRequest.java  |   2 +-
 .../internal/locator/LocatorStatusResponse.java |   2 +-
 .../internal/pooling/ConnectionManager.java     |   2 +-
 .../internal/pooling/ConnectionManagerImpl.java |   2 +-
 .../internal/pooling/PooledConnection.java      |   2 +-
 .../gemfire/cache/control/RebalanceFactory.java |   6 +-
 .../cache/control/RebalanceOperation.java       |   2 +-
 .../gemfire/cache/control/RebalanceResults.java |   2 +-
 .../gemfire/cache/control/ResourceManager.java  |  18 +--
 .../execute/EmptyRegionFunctionException.java   |   2 +-
 .../gemfire/cache/execute/Execution.java        |  18 +--
 .../gemfire/cache/execute/Function.java         |  12 +-
 .../gemfire/cache/execute/FunctionAdapter.java  |   2 +-
 .../gemfire/cache/execute/FunctionContext.java  |  10 +-
 .../cache/execute/FunctionException.java        |  16 +--
 .../FunctionInvocationTargetException.java      |   6 +-
 .../gemfire/cache/execute/FunctionService.java  |  36 +++---
 .../cache/execute/RegionFunctionContext.java    |   6 +-
 .../gemfire/cache/execute/ResultCollector.java  |  12 +-
 .../gemfire/cache/execute/ResultSender.java     |   4 +-
 .../internal/FunctionServiceManager.java        |  30 ++---
 .../operations/CloseCQOperationContext.java     |   2 +-
 .../operations/DestroyOperationContext.java     |   2 +-
 .../operations/ExecuteCQOperationContext.java   |   2 +-
 .../ExecuteFunctionOperationContext.java        |   2 +-
 .../GetDurableCQsOperationContext.java          |   2 +-
 .../cache/operations/GetOperationContext.java   |   2 +-
 .../operations/InterestOperationContext.java    |   2 +-
 .../gemfire/cache/operations/InterestType.java  |   2 +-
 .../operations/InvalidateOperationContext.java  |   2 +-
 .../cache/operations/KeyOperationContext.java   |   2 +-
 .../operations/KeySetOperationContext.java      |   2 +-
 .../operations/KeyValueOperationContext.java    |  12 +-
 .../cache/operations/OperationContext.java      |   6 +-
 .../operations/PutAllOperationContext.java      |   6 +-
 .../cache/operations/PutOperationContext.java   |   8 +-
 .../cache/operations/QueryOperationContext.java |   2 +-
 .../operations/RegionClearOperationContext.java |   2 +-
 .../RegionCreateOperationContext.java           |   2 +-
 .../RegionDestroyOperationContext.java          |   2 +-
 .../operations/RegionOperationContext.java      |   2 +-
 .../RegisterInterestOperationContext.java       |   2 +-
 .../operations/RemoveAllOperationContext.java   |   2 +-
 .../operations/StopCQOperationContext.java      |   2 +-
 .../UnregisterInterestOperationContext.java     |   2 +-
 .../cache/partition/PartitionListener.java      |  10 +-
 .../partition/PartitionListenerAdapter.java     |   2 +-
 .../cache/partition/PartitionMemberInfo.java    |   2 +-
 .../PartitionNotAvailableException.java         |   2 +-
 .../cache/partition/PartitionRebalanceInfo.java |   2 +-
 .../cache/partition/PartitionRegionHelper.java  |  32 ++---
 .../cache/partition/PartitionRegionInfo.java    |   2 +-
 .../ConflictingPersistentDataException.java     |   2 +-
 .../persistence/PartitionOfflineException.java  |   2 +-
 .../gemfire/cache/persistence/PersistentID.java |   4 +-
 .../PersistentReplicatesOfflineException.java   |   2 +-
 .../persistence/RevokeFailedException.java      |   2 +-
 .../RevokedPersistentDataException.java         |   2 +-
 .../cache/query/AmbiguousNameException.java     |   2 +-
 .../gemfire/cache/query/CqAttributes.java       |   2 +-
 .../cache/query/CqAttributesFactory.java        |   2 +-
 .../cache/query/CqAttributesMutator.java        |   2 +-
 .../gemfire/cache/query/CqClosedException.java  |   2 +-
 .../gemstone/gemfire/cache/query/CqEvent.java   |   4 +-
 .../gemfire/cache/query/CqException.java        |   2 +-
 .../gemfire/cache/query/CqExistsException.java  |   2 +-
 .../gemfire/cache/query/CqListener.java         |   2 +-
 .../gemstone/gemfire/cache/query/CqQuery.java   |   4 +-
 .../gemstone/gemfire/cache/query/CqResults.java |   2 +-
 .../cache/query/CqServiceStatistics.java        |   2 +-
 .../gemstone/gemfire/cache/query/CqState.java   |   2 +-
 .../gemfire/cache/query/CqStatistics.java       |   2 +-
 .../gemfire/cache/query/CqStatusListener.java   |   2 +-
 .../cache/query/FunctionDomainException.java    |   2 +-
 .../com/gemstone/gemfire/cache/query/Index.java |   2 +-
 .../cache/query/IndexExistsException.java       |   2 +-
 .../cache/query/IndexInvalidException.java      |   2 +-
 .../cache/query/IndexMaintenanceException.java  |   2 +-
 .../cache/query/IndexNameConflictException.java |   2 +-
 .../gemfire/cache/query/IndexStatistics.java    |   2 +-
 .../gemstone/gemfire/cache/query/IndexType.java |   2 +-
 .../query/MultiIndexCreationException.java      |   2 +-
 .../cache/query/NameNotFoundException.java      |   2 +-
 .../cache/query/NameResolutionException.java    |   2 +-
 .../query/ParameterCountInvalidException.java   |   2 +-
 .../com/gemstone/gemfire/cache/query/Query.java |   6 +-
 .../gemfire/cache/query/QueryException.java     |   2 +-
 .../query/QueryExecutionLowMemoryException.java |   2 +-
 .../query/QueryExecutionTimeoutException.java   |   2 +-
 .../cache/query/QueryInvalidException.java      |   2 +-
 .../query/QueryInvocationTargetException.java   |   2 +-
 .../gemfire/cache/query/QueryService.java       |  30 ++---
 .../gemfire/cache/query/QueryStatistics.java    |   2 +-
 .../cache/query/RegionNotFoundException.java    |   2 +-
 .../gemfire/cache/query/SelectResults.java      |   4 +-
 .../gemstone/gemfire/cache/query/Struct.java    |   2 +-
 .../cache/query/TypeMismatchException.java      |   2 +-
 .../gemfire/cache/query/internal/Bag.java       |   2 +-
 .../cache/query/internal/CompiledLike.java      |   2 +-
 .../cache/query/internal/CompiledSelect.java    |   2 +-
 .../gemfire/cache/query/internal/CqEntry.java   |   2 +-
 .../cache/query/internal/CqQueryVsdStats.java   |   2 +-
 .../cache/query/internal/CqStateImpl.java       |   2 +-
 .../cache/query/internal/HashingStrategy.java   |   2 +-
 .../gemfire/cache/query/internal/NullToken.java |   2 +-
 .../gemfire/cache/query/internal/PlanInfo.java  |   2 +-
 .../cache/query/internal/ProxyQueryService.java |   2 +-
 .../gemfire/cache/query/internal/QRegion.java   |   2 +-
 .../QueryExecutionCanceledException.java        |   2 +-
 .../query/internal/QueryExecutionContext.java   |   2 +-
 .../cache/query/internal/QueryExecutor.java     |   2 +-
 .../cache/query/internal/QueryMonitor.java      |   2 +-
 .../ResultsCollectionCopyOnReadWrapper.java     |   2 +-
 .../internal/ResultsCollectionWrapper.java      |   2 +-
 .../cache/query/internal/ResultsSet.java        |   2 +-
 .../cache/query/internal/SortedResultSet.java   |   2 +-
 .../cache/query/internal/SortedStructSet.java   |   2 +-
 .../gemfire/cache/query/internal/StructBag.java |   2 +-
 .../cache/query/internal/StructImpl.java        |   2 +-
 .../gemfire/cache/query/internal/StructSet.java |   4 +-
 .../query/internal/index/CompactRangeIndex.java |   2 +-
 .../internal/index/IndexConcurrentHashSet.java  |   2 +-
 .../query/internal/index/IndexElemArray.java    |   2 +-
 .../cache/query/internal/index/IndexStats.java  |   6 +-
 .../cache/query/internal/index/IndexStore.java  |   6 +-
 .../query/internal/index/MemoryIndexStore.java  |   2 +-
 .../query/internal/index/PartitionedIndex.java  |   2 +-
 .../cache/query/internal/parse/ASTHint.java     |   2 +-
 .../query/internal/parse/ASTHintIdentifier.java |   2 +-
 .../cache/query/internal/parse/ASTTrace.java    |   2 +-
 .../internal/types/CollectionTypeImpl.java      |   2 +-
 .../cache/query/internal/types/MapTypeImpl.java |   2 +-
 .../query/internal/types/ObjectTypeImpl.java    |   2 +-
 .../query/internal/types/StructTypeImpl.java    |   2 +-
 .../cache/query/types/CollectionType.java       |   2 +-
 .../gemfire/cache/query/types/MapType.java      |   2 +-
 .../gemfire/cache/query/types/ObjectType.java   |   2 +-
 .../gemfire/cache/query/types/StructType.java   |   2 +-
 .../gemfire/cache/server/CacheServer.java       |  62 +++++-----
 .../cache/server/ClientSubscriptionConfig.java  |  18 +--
 .../gemfire/cache/server/ServerLoad.java        |   2 +-
 .../gemfire/cache/server/ServerLoadProbe.java   |   2 +-
 .../cache/server/ServerLoadProbeAdapter.java    |   2 +-
 .../gemfire/cache/server/ServerMetrics.java     |   2 +-
 .../server/internal/ConnectionCountProbe.java   |   2 +-
 .../cache/server/internal/LoadMonitor.java      |   4 +-
 .../server/internal/ServerMetricsImpl.java      |   2 +-
 .../cache/snapshot/CacheSnapshotService.java    |   2 +-
 .../cache/snapshot/RegionSnapshotService.java   |   2 +-
 .../gemfire/cache/snapshot/SnapshotFilter.java  |   2 +-
 .../cache/snapshot/SnapshotIterator.java        |   2 +-
 .../gemfire/cache/snapshot/SnapshotOptions.java |   4 +-
 .../gemfire/cache/snapshot/SnapshotReader.java  |   2 +-
 .../cache/util/CacheListenerAdapter.java        |   2 +-
 .../gemfire/cache/util/CacheWriterAdapter.java  |   2 +-
 .../gemfire/cache/util/CqListenerAdapter.java   |   2 +-
 .../gemstone/gemfire/cache/util/Gateway.java    |   4 +-
 .../cache/util/GatewayConflictHelper.java       |   2 +-
 .../cache/util/GatewayConflictResolver.java     |   2 +-
 .../gemfire/cache/util/GatewayEvent.java        |   4 +-
 .../gemfire/cache/util/ObjectSizer.java         |   8 +-
 .../util/RegionMembershipListenerAdapter.java   |   2 +-
 .../cache/util/TimestampedEntryEvent.java       |   2 +-
 .../cache/util/TransactionListenerAdapter.java  |   2 +-
 .../gemfire/cache/wan/GatewayEventFilter.java   |   2 +-
 .../gemfire/cache/wan/GatewayQueueEvent.java    |   2 +-
 .../gemfire/cache/wan/GatewayReceiver.java      |   2 +-
 .../cache/wan/GatewayReceiverFactory.java       |   4 +-
 .../gemfire/cache/wan/GatewaySender.java        |   4 +-
 .../gemfire/cache/wan/GatewaySenderFactory.java |   2 +-
 .../gemfire/compression/SnappyCompressor.java   |   2 +-
 .../gemfire/distributed/AbstractLauncher.java   |   2 +-
 .../distributed/ClientSocketFactory.java        |   2 +-
 .../gemfire/distributed/DistributedMember.java  |   4 +-
 .../gemfire/distributed/DistributedSystem.java  |  52 ++++----
 .../DistributedSystemDisconnectedException.java |   2 +-
 .../distributed/FutureCancelledException.java   |   2 +-
 .../distributed/GatewayCancelledException.java  |   2 +-
 .../gemstone/gemfire/distributed/Locator.java   |  20 ++--
 .../gemfire/distributed/LocatorLauncher.java    |   2 +-
 .../distributed/LockNotHeldException.java       |   2 +-
 .../LockServiceDestroyedException.java          |   2 +-
 .../distributed/OplogCancelledException.java    |   2 +-
 .../distributed/PoolCancelledException.java     |   2 +-
 .../gemfire/distributed/ServerLauncher.java     |   2 +-
 .../TXManagerCancelledException.java            |   2 +-
 .../internal/AbstractDistributionConfig.java    |   2 +-
 .../internal/AtomicLongWithTerminalState.java   |   2 +-
 .../distributed/internal/ConflationKey.java     |   2 +-
 .../gemfire/distributed/internal/DM.java        |  34 +++---
 .../gemfire/distributed/internal/DMStats.java   | 120 +++++++++----------
 .../gemfire/distributed/internal/DSClock.java   |   4 +-
 .../internal/DistributionAdvisee.java           |   2 +-
 .../internal/DistributionAdvisor.java           |  34 +++---
 .../internal/DistributionChannel.java           |   2 +-
 .../internal/DistributionConfig.java            | 112 ++++++++---------
 .../internal/DistributionConfigImpl.java        |  12 +-
 .../internal/DistributionManager.java           |  44 +++----
 .../internal/DistributionMessage.java           |  12 +-
 .../distributed/internal/DistributionStats.java |  28 ++---
 .../distributed/internal/FlowControlParams.java |   2 +-
 .../distributed/internal/HealthMonitor.java     |   2 +-
 .../distributed/internal/HealthMonitorImpl.java |   2 +-
 .../internal/HighPriorityAckedMessage.java      |   2 +-
 .../internal/InternalDistributedSystem.java     |  20 ++--
 .../distributed/internal/InternalLocator.java   |  14 +--
 .../internal/LocatorLoadSnapshot.java           |   2 +-
 .../distributed/internal/LocatorStats.java      |   2 +-
 .../internal/LonerDistributionManager.java      |   4 +-
 .../distributed/internal/MessageWithReply.java  |   2 +-
 .../distributed/internal/PoolStatHelper.java    |   2 +-
 .../distributed/internal/ProductUseLog.java     |   2 +-
 .../distributed/internal/QueueStatHelper.java   |   2 +-
 .../internal/ReliableReplyProcessor21.java      |   2 +-
 .../distributed/internal/ReplyException.java    |   6 +-
 .../distributed/internal/ReplyProcessor21.java  |  12 +-
 .../internal/RuntimeDistributionConfigImpl.java |   2 +-
 .../distributed/internal/ServerLocator.java     |   2 +-
 .../internal/SharedConfiguration.java           |   2 +-
 .../gemfire/distributed/internal/Sizeable.java  |   2 +-
 .../distributed/internal/SizeableRunnable.java  |   2 +-
 .../distributed/internal/StartupMessage.java    |   6 +-
 .../internal/StartupMessageData.java            |   2 +-
 .../StartupResponseWithVersionMessage.java      |   2 +-
 .../internal/ThrottledMemQueueStatHelper.java   |   2 +-
 .../internal/ThrottledQueueStatHelper.java      |   2 +-
 .../ThrottlingMemLinkedQueueWithDMStats.java    |   2 +-
 .../internal/direct/DirectChannel.java          |   6 +-
 .../internal/locks/DLockService.java            |   4 +-
 .../distributed/internal/locks/DLockStats.java  |   6 +-
 .../internal/locks/DeposeGrantorProcessor.java  |   2 +-
 .../internal/locks/DistributedMemberLock.java   |   2 +-
 .../internal/locks/ElderInitProcessor.java      |   2 +-
 .../distributed/internal/locks/ElderState.java  |   2 +-
 .../distributed/internal/locks/GrantorInfo.java |   2 +-
 .../internal/locks/GrantorRequestProcessor.java |   2 +-
 .../locks/LockGrantorDestroyedException.java    |   2 +-
 .../internal/locks/LockGrantorId.java           |   2 +-
 .../locks/NonGrantorDestroyedProcessor.java     |   2 +-
 .../membership/InternalDistributedMember.java   |   4 +-
 .../internal/membership/MemberAttributes.java   |   2 +-
 .../internal/membership/MembershipManager.java  |   6 +-
 .../internal/membership/NetMember.java          |   4 +-
 .../internal/membership/NetView.java            |   2 +-
 .../gms/mgr/GMSMembershipManager.java           |   2 +-
 .../internal/tcpserver/InfoRequest.java         |   2 +-
 .../internal/tcpserver/InfoResponse.java        |   2 +-
 .../internal/tcpserver/ShutdownRequest.java     |   2 +-
 .../internal/tcpserver/ShutdownResponse.java    |   2 +-
 .../internal/tcpserver/TcpClient.java           |   2 +-
 .../internal/tcpserver/TcpHandler.java          |   2 +-
 .../internal/tcpserver/TcpServer.java           |   4 +-
 .../internal/tcpserver/VersionRequest.java      |   2 +-
 .../internal/tcpserver/VersionResponse.java     |   2 +-
 .../unsafe/RegisterSignalHandlerSupport.java    |   2 +-
 .../gemstone/gemfire/i18n/LogWriterI18n.java    |  60 +++++-----
 .../com/gemstone/gemfire/i18n/StringId.java     |   2 +-
 .../internal/AbstractStatisticsFactory.java     |   2 +-
 .../gemfire/internal/ByteArrayDataInput.java    |   2 +-
 .../internal/ByteBufferOutputStream.java        |   2 +-
 .../gemfire/internal/ClassPathLoader.java       |   6 +-
 .../com/gemstone/gemfire/internal/Config.java   |   6 +-
 .../gemstone/gemfire/internal/ConfigSource.java |   2 +-
 .../com/gemstone/gemfire/internal/DSCODE.java   |  66 +++++-----
 .../gemstone/gemfire/internal/DSFIDFactory.java |   2 +-
 .../internal/DataSerializableFixedID.java       |   2 +-
 .../gemfire/internal/DistributionLocator.java   |   2 +-
 .../gemfire/internal/DummyStatisticsImpl.java   |   2 +-
 .../gemfire/internal/ExternalizableDSFID.java   |   2 +-
 .../gemfire/internal/GemFireStatSampler.java    |   2 +-
 .../gemfire/internal/GemFireUtilLauncher.java   |   2 +-
 .../gemfire/internal/GemFireVersion.java        |   4 +-
 .../internal/GfeConsoleReaderFactory.java       |   2 +-
 .../gemfire/internal/HeapDataOutputStream.java  |   2 +-
 .../gemfire/internal/HostStatHelper.java        |   2 +-
 .../gemfire/internal/HostStatSampler.java       |   6 +-
 .../internal/InternalDataSerializer.java        |  26 ++--
 .../gemfire/internal/InternalEntity.java        |   2 +-
 .../gemfire/internal/InternalInstantiator.java  |   4 +-
 .../InternalStatisticsDisabledException.java    |   2 +-
 .../gemfire/internal/JarClassLoader.java        |   4 +-
 .../gemfire/internal/LinuxProcessStats.java     |   2 +-
 .../gemfire/internal/LocalStatisticsImpl.java   |   2 +-
 .../gemfire/internal/MigrationClient.java       |   2 +-
 .../gemfire/internal/MigrationServer.java       |   2 +-
 .../gemfire/internal/NullDataOutputStream.java  |   2 +-
 .../gemstone/gemfire/internal/OSProcess.java    |   2 +-
 .../gemfire/internal/OSXProcessStats.java       |   2 +-
 .../gemfire/internal/ObjIdConcurrentMap.java    |   4 +-
 .../internal/ObjToByteArraySerializer.java      |   2 +-
 .../gemfire/internal/OneTaskOnlyExecutor.java   |   2 +-
 .../gemfire/internal/OsStatisticsFactory.java   |   2 +-
 .../gemstone/gemfire/internal/ProcessStats.java |   2 +-
 .../gemstone/gemfire/internal/PureJavaMode.java |   2 +-
 .../com/gemstone/gemfire/internal/Sendable.java |   2 +-
 .../com/gemstone/gemfire/internal/SetUtils.java |   2 +-
 .../gemfire/internal/SharedLibrary.java         |   2 +-
 .../gemfire/internal/SolarisProcessStats.java   |   2 +-
 .../internal/StatisticDescriptorImpl.java       |   2 +-
 .../gemfire/internal/StatisticsImpl.java        |   4 +-
 .../internal/StatisticsTypeFactoryImpl.java     |   2 +-
 .../gemfire/internal/StatisticsTypeImpl.java    |   2 +-
 .../gemstone/gemfire/internal/SystemAdmin.java  |   2 +-
 .../gemfire/internal/SystemFailureTestHook.java |   2 +-
 .../gemfire/internal/UniqueIdGenerator.java     |   2 +-
 .../com/gemstone/gemfire/internal/Version.java  |   2 +-
 .../internal/VersionedDataInputStream.java      |   2 +-
 .../internal/VersionedDataOutputStream.java     |   2 +-
 .../gemfire/internal/VersionedDataStream.java   |   2 +-
 .../gemfire/internal/VersionedObjectInput.java  |   2 +-
 .../gemfire/internal/VersionedObjectOutput.java |   2 +-
 .../gemfire/internal/WindowsProcessStats.java   |   2 +-
 .../internal/admin/AdminBridgeServer.java       |   2 +-
 .../gemstone/gemfire/internal/admin/Alert.java  |   2 +-
 .../gemfire/internal/admin/CacheInfo.java       |   6 +-
 .../gemfire/internal/admin/GemFireVM.java       |  34 +++---
 .../gemfire/internal/admin/GfManagerAgent.java  |   6 +-
 .../gemfire/internal/admin/HealthListener.java  |   2 +-
 .../gemfire/internal/admin/SSLConfig.java       |   2 +-
 .../internal/admin/StatAlertsManager.java       |   2 +-
 .../admin/remote/AddHealthListenerRequest.java  |   2 +-
 .../admin/remote/AddHealthListenerResponse.java |   2 +-
 .../remote/AdminConsoleDisconnectMessage.java   |   2 +-
 .../admin/remote/AdminReplyProcessor.java       |   2 +-
 .../admin/remote/AlertLevelChangeMessage.java   |   2 +-
 .../admin/remote/AlertsNotificationMessage.java |   2 +-
 .../admin/remote/BridgeServerRequest.java       |   2 +-
 .../admin/remote/BridgeServerResponse.java      |   2 +-
 .../admin/remote/CacheConfigRequest.java        |   2 +-
 .../admin/remote/CacheConfigResponse.java       |   4 +-
 .../internal/admin/remote/CacheInfoRequest.java |   2 +-
 .../admin/remote/CacheInfoResponse.java         |   2 +-
 .../remote/ChangeRefreshIntervalMessage.java    |   2 +-
 .../admin/remote/DistributionLocatorId.java     |   6 +-
 .../admin/remote/DurableClientInfoRequest.java  |   2 +-
 .../admin/remote/DurableClientInfoResponse.java |   2 +-
 .../remote/FetchHealthDiagnosisRequest.java     |   2 +-
 .../remote/FetchHealthDiagnosisResponse.java    |   2 +-
 .../admin/remote/HealthListenerMessage.java     |   2 +-
 .../internal/admin/remote/RegionRequest.java    |   2 +-
 .../internal/admin/remote/RegionResponse.java   |   2 +-
 .../internal/admin/remote/RemoteAlert.java      |   2 +-
 .../admin/remote/RemoteBridgeServer.java        |   8 +-
 .../internal/admin/remote/RemoteGemFireVM.java  |   4 +-
 .../admin/remote/RemoteGfManagerAgent.java      |   6 +-
 .../admin/remote/RemoteTransportConfig.java     |   4 +-
 .../remote/RemoveHealthListenerRequest.java     |   2 +-
 .../remote/RemoveHealthListenerResponse.java    |   2 +-
 .../admin/remote/ResetHealthStatusRequest.java  |   2 +-
 .../admin/remote/ResetHealthStatusResponse.java |   2 +-
 .../remote/ShutdownAllGatewayHubsRequest.java   |   2 +-
 .../remote/StatAlertsManagerAssignMessage.java  |   2 +-
 .../admin/remote/VersionInfoRequest.java        |   2 +-
 .../admin/remote/VersionInfoResponse.java       |   2 +-
 .../admin/remote/VersionMismatchAlert.java      |   2 +-
 .../internal/cache/AbstractCacheServer.java     |   8 +-
 .../cache/AbstractDiskLRURegionEntry.java       |   2 +-
 .../internal/cache/AbstractDiskRegion.java      |   4 +-
 .../internal/cache/AbstractLRURegionEntry.java  |   2 +-
 .../internal/cache/AbstractLRURegionMap.java    |   8 +-
 .../cache/AbstractOplogDiskRegionEntry.java     |   2 +-
 .../gemfire/internal/cache/AbstractRegion.java  |  22 ++--
 .../internal/cache/AbstractRegionEntry.java     |   2 +-
 .../internal/cache/AbstractRegionMap.java       |   2 +-
 .../internal/cache/AbstractUpdateOperation.java |   2 +-
 .../gemfire/internal/cache/BucketAdvisor.java   |   2 +-
 .../gemfire/internal/cache/BucketRegion.java    |   6 +-
 .../internal/cache/BucketRegionEvictior.java    |   2 +-
 .../internal/cache/BucketServerLocation.java    |   2 +-
 .../internal/cache/BucketServerLocation66.java  |   2 +-
 .../cache/BytesAndBitsForCompactor.java         |   2 +-
 .../internal/cache/CacheClientStatus.java       |   2 +-
 .../gemfire/internal/cache/CacheConfig.java     |   2 +-
 .../cache/CacheDistributionAdvisee.java         |   2 +-
 .../cache/CacheDistributionAdvisor.java         |  18 +--
 .../gemfire/internal/cache/CachePerfStats.java  |  16 +--
 .../internal/cache/CacheServerAdvisor.java      |   2 +-
 .../gemfire/internal/cache/CacheServerImpl.java |  20 ++--
 .../internal/cache/CacheServerLauncher.java     |   2 +-
 .../internal/cache/CachedDeserializable.java    |   4 +-
 .../cache/CachedDeserializableFactory.java      |   4 +-
 .../internal/cache/ClientRegionEventImpl.java   |   2 +-
 .../internal/cache/ClientServerObserver.java    |   2 +-
 .../cache/ClientServerObserverAdapter.java      |   2 +-
 .../cache/ClientServerObserverHolder.java       |   2 +-
 .../cache/ClientSubscriptionConfigImpl.java     |  16 +--
 .../internal/cache/ColocationHelper.java        |  12 +-
 .../internal/cache/CommitReplyException.java    |   2 +-
 .../internal/cache/CompactableOplog.java        |   2 +-
 .../gemfire/internal/cache/Conflatable.java     |   2 +-
 .../internal/cache/ControllerAdvisor.java       |   2 +-
 .../internal/cache/CountingDataInputStream.java |   2 +-
 .../internal/cache/CustomEntryExpiryTask.java   |   2 +-
 .../cache/DestroyPartitionedRegionMessage.java  |   4 +-
 .../gemfire/internal/cache/DirectoryHolder.java |   2 +-
 .../internal/cache/DiskDirectoryStats.java      |   2 +-
 .../gemfire/internal/cache/DiskEntry.java       |  14 +--
 .../gemstone/gemfire/internal/cache/DiskId.java |  22 ++--
 .../gemfire/internal/cache/DiskInitFile.java    |  38 +++---
 .../gemfire/internal/cache/DiskRegion.java      |  14 +--
 .../gemfire/internal/cache/DiskRegionStats.java |   2 +-
 .../internal/cache/DiskStoreAttributes.java     |   2 +-
 .../internal/cache/DiskStoreFactoryImpl.java    |   2 +-
 .../gemfire/internal/cache/DiskStoreImpl.java   |  22 ++--
 .../gemfire/internal/cache/DiskStoreStats.java  |   2 +-
 .../internal/cache/DiskWriteAttributesImpl.java |   4 +-
 .../cache/DistributedCacheOperation.java        |  16 +--
 .../cache/DistributedPutAllOperation.java       |   2 +-
 .../internal/cache/DistributedRegion.java       |  18 +--
 .../cache/DistributedRemoveAllOperation.java    |   2 +-
 .../internal/cache/DummyCachePerfStats.java     |   2 +-
 .../cache/DynamicRegionFactoryImpl.java         |   2 +-
 .../gemfire/internal/cache/EntriesMap.java      |   2 +-
 .../gemfire/internal/cache/EntryEventImpl.java  |  22 ++--
 .../internal/cache/EntryOperationImpl.java      |   4 +-
 .../gemfire/internal/cache/EntrySnapshot.java   |   6 +-
 .../internal/cache/EnumListenerEvent.java       |   2 +-
 .../gemfire/internal/cache/EventID.java         |   8 +-
 .../gemfire/internal/cache/EventTracker.java    |  10 +-
 .../internal/cache/EvictionAttributesImpl.java  |   4 +-
 .../gemfire/internal/cache/ExpiryTask.java      |   4 +-
 .../gemfire/internal/cache/FilterProfile.java   |   2 +-
 .../internal/cache/FilterRoutingInfo.java       |   2 +-
 .../cache/FindDurableQueueProcessor.java        |   2 +-
 .../cache/FixedPartitionAttributesImpl.java     |   2 +-
 .../internal/cache/ForceReattemptException.java |   2 +-
 .../cache/ForceableLinkedBlockingQueue.java     |   2 +-
 .../internal/cache/GemFireCacheImpl.java        |  60 +++++-----
 .../gemfire/internal/cache/GridAdvisor.java     |   4 +-
 .../gemfire/internal/cache/HARegion.java        |   4 +-
 .../internal/cache/IncomingGatewayStatus.java   |   2 +-
 .../gemfire/internal/cache/InternalCache.java   |   2 +-
 .../internal/cache/InternalCacheEvent.java      |   2 +-
 .../internal/cache/InternalDataView.java        |   2 +-
 .../internal/cache/InternalRegionArguments.java |   2 +-
 .../internal/cache/LoaderHelperFactory.java     |   4 +-
 .../internal/cache/LoaderHelperImpl.java        |   2 +-
 .../gemfire/internal/cache/LocalRegion.java     |  98 +++++++--------
 .../internal/cache/LocalRegionDataView.java     |   2 +-
 .../cache/MinimumSystemRequirements.java        |   8 +-
 .../gemstone/gemfire/internal/cache/OpType.java |   2 +-
 .../gemstone/gemfire/internal/cache/Oplog.java  |  72 +++++------
 .../gemfire/internal/cache/OverflowOplog.java   |   4 +-
 .../internal/cache/PRHARedundancyProvider.java  |   8 +-
 .../internal/cache/PartitionAttributesImpl.java |   6 +-
 .../internal/cache/PartitionedRegion.java       |  54 ++++-----
 .../PartitionedRegionBucketMgmtHelper.java      |   2 +-
 .../cache/PartitionedRegionDataStore.java       |   4 +-
 .../cache/PartitionedRegionDataView.java        |   2 +-
 .../cache/PartitionedRegionQueryEvaluator.java  |   6 +-
 .../internal/cache/PartitionedRegionStats.java  |   2 +-
 .../internal/cache/PartitionedRegionStatus.java |   2 +-
 .../internal/cache/PlaceHolderDiskRegion.java   |   2 +-
 .../gemfire/internal/cache/PoolFactoryImpl.java |   4 +-
 .../gemfire/internal/cache/PoolManagerImpl.java |   2 +-
 .../gemfire/internal/cache/PoolStats.java       |   2 +-
 .../cache/PreferBytesCachedDeserializable.java  |   2 +-
 .../internal/cache/PrimaryBucketException.java  |   2 +-
 .../internal/cache/ProxyBucketRegion.java       |   2 +-
 .../gemfire/internal/cache/ProxyRegionMap.java  |   2 +-
 .../cache/PutAllPartialResultException.java     |   2 +-
 .../gemfire/internal/cache/QueuedOperation.java |   2 +-
 .../internal/cache/RegionClearedException.java  |   2 +-
 .../gemfire/internal/cache/RegionEntry.java     |  14 +--
 .../internal/cache/RegionEntryContext.java      |   2 +-
 .../internal/cache/RegionEntryFactory.java      |   2 +-
 .../gemfire/internal/cache/RegionEventImpl.java |   2 +-
 .../internal/cache/RegionEvictorTask.java       |   2 +-
 .../internal/cache/RegionFactoryImpl.java       |   2 +-
 .../gemfire/internal/cache/RegionMap.java       |   2 +-
 .../internal/cache/RegionMapFactory.java        |   2 +-
 .../gemfire/internal/cache/RegionQueue.java     |   2 +-
 .../internal/cache/RegionQueueException.java    |   2 +-
 .../gemfire/internal/cache/RegionStatus.java    |   2 +-
 .../cache/ReliableDistributionData.java         |   2 +-
 .../internal/cache/ReliableMessageQueue.java    |   2 +-
 .../cache/ReliableMessageQueueFactory.java      |   2 +-
 .../cache/ReliableMessageQueueFactoryImpl.java  |   4 +-
 .../cache/RemoteContainsKeyValueMessage.java    |   4 +-
 .../internal/cache/RemoteDestroyMessage.java    |   4 +-
 .../internal/cache/RemoteFetchEntryMessage.java |   4 +-
 .../cache/RemoteFetchVersionMessage.java        |   2 +-
 .../internal/cache/RemoteGetMessage.java        |   6 +-
 .../internal/cache/RemoteInvalidateMessage.java |   2 +-
 .../cache/RemoteOperationException.java         |   2 +-
 .../internal/cache/RemoteOperationMessage.java  |   6 +-
 .../internal/cache/RemotePutAllMessage.java     |   2 +-
 .../internal/cache/RemotePutMessage.java        |   4 +-
 .../internal/cache/RemoteRegionOperation.java   |   2 +-
 .../internal/cache/RemoteRemoveAllMessage.java  |   2 +-
 .../gemfire/internal/cache/RoleEventImpl.java   |   2 +-
 .../internal/cache/SendQueueOperation.java      |   2 +-
 .../internal/cache/StateFlushOperation.java     |   8 +-
 .../cache/StoreAllCachedDeserializable.java     |   2 +-
 .../gemfire/internal/cache/TXCommitMessage.java |  16 +--
 .../gemfire/internal/cache/TXEntry.java         |   2 +-
 .../gemfire/internal/cache/TXEntryState.java    |  32 ++---
 .../internal/cache/TXEntryUserAttrState.java    |   2 +-
 .../gemfire/internal/cache/TXEvent.java         |   2 +-
 .../internal/cache/TXFarSideCMTracker.java      |   2 +-
 .../gemstone/gemfire/internal/cache/TXId.java   |   2 +-
 .../gemfire/internal/cache/TXLockRequest.java   |   2 +-
 .../gemfire/internal/cache/TXManagerImpl.java   |   2 +-
 .../internal/cache/TXRegionLockRequestImpl.java |   2 +-
 .../gemfire/internal/cache/TXRegionState.java   |   2 +-
 .../internal/cache/TXRemoteCommitMessage.java   |   4 +-
 .../internal/cache/TXReservationMgr.java        |   2 +-
 .../gemfire/internal/cache/TXRmtEvent.java      |   2 +-
 .../gemfire/internal/cache/TXState.java         |   4 +-
 .../internal/cache/TXStateInterface.java        |   2 +-
 .../cache/TXSynchronizationRunnable.java        |   2 +-
 .../cache/UpdateAttributesProcessor.java        |  12 +-
 .../cache/UserSpecifiedDiskStoreAttributes.java |   2 +-
 .../cache/UserSpecifiedRegionAttributes.java    |  22 ++--
 .../gemfire/internal/cache/VMLRURegionMap.java  |   2 +-
 .../gemfire/internal/cache/VMRegionMap.java     |   2 +-
 .../cache/VMStatsDiskLRURegionEntry.java        |   2 +-
 .../VMStatsDiskLRURegionEntryHeapIntKey.java    |   2 +-
 .../VMStatsDiskLRURegionEntryHeapLongKey.java   |   2 +-
 .../VMStatsDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...VMStatsDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...VMStatsDiskLRURegionEntryHeapStringKey2.java |   2 +-
 .../VMStatsDiskLRURegionEntryHeapUUIDKey.java   |   2 +-
 .../VMStatsDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...VMStatsDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../internal/cache/VMStatsDiskRegionEntry.java  |   2 +-
 .../cache/VMStatsDiskRegionEntryHeapIntKey.java |   2 +-
 .../VMStatsDiskRegionEntryHeapLongKey.java      |   2 +-
 .../VMStatsDiskRegionEntryHeapObjectKey.java    |   2 +-
 .../VMStatsDiskRegionEntryHeapStringKey1.java   |   2 +-
 .../VMStatsDiskRegionEntryHeapStringKey2.java   |   2 +-
 .../VMStatsDiskRegionEntryHeapUUIDKey.java      |   2 +-
 .../VMStatsDiskRegionEntryOffHeapIntKey.java    |   2 +-
 .../VMStatsDiskRegionEntryOffHeapLongKey.java   |   2 +-
 .../VMStatsDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...VMStatsDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...VMStatsDiskRegionEntryOffHeapStringKey2.java |   2 +-
 .../VMStatsDiskRegionEntryOffHeapUUIDKey.java   |   2 +-
 .../internal/cache/VMStatsLRURegionEntry.java   |   2 +-
 .../internal/cache/VMStatsRegionEntry.java      |   2 +-
 .../cache/VMThinDiskLRURegionEntry.java         |   2 +-
 .../VMThinDiskLRURegionEntryHeapIntKey.java     |   2 +-
 .../VMThinDiskLRURegionEntryHeapLongKey.java    |   2 +-
 .../VMThinDiskLRURegionEntryHeapObjectKey.java  |   2 +-
 .../VMThinDiskLRURegionEntryHeapStringKey1.java |   2 +-
 .../VMThinDiskLRURegionEntryHeapStringKey2.java |   2 +-
 .../VMThinDiskLRURegionEntryHeapUUIDKey.java    |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapIntKey.java  |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...MThinDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 .../VMThinDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../internal/cache/VMThinDiskRegionEntry.java   |   2 +-
 .../cache/VMThinDiskRegionEntryHeapIntKey.java  |   2 +-
 .../cache/VMThinDiskRegionEntryHeapLongKey.java |   2 +-
 .../VMThinDiskRegionEntryHeapObjectKey.java     |   2 +-
 .../VMThinDiskRegionEntryHeapStringKey1.java    |   2 +-
 .../VMThinDiskRegionEntryHeapStringKey2.java    |   2 +-
 .../cache/VMThinDiskRegionEntryHeapUUIDKey.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapIntKey.java     |   2 +-
 .../VMThinDiskRegionEntryOffHeapLongKey.java    |   2 +-
 .../VMThinDiskRegionEntryOffHeapObjectKey.java  |   2 +-
 .../VMThinDiskRegionEntryOffHeapStringKey1.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapStringKey2.java |   2 +-
 .../VMThinDiskRegionEntryOffHeapUUIDKey.java    |   2 +-
 .../internal/cache/VMThinLRURegionEntry.java    |   2 +-
 .../internal/cache/VMThinRegionEntry.java       |   2 +-
 .../internal/cache/ValidatingDiskRegion.java    |   2 +-
 ...sionedStatsDiskLRURegionEntryHeapIntKey.java |   2 +-
 ...ionedStatsDiskLRURegionEntryHeapLongKey.java |   2 +-
 ...nedStatsDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...edStatsDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...edStatsDiskLRURegionEntryHeapStringKey2.java |   2 +-
 ...ionedStatsDiskLRURegionEntryHeapUUIDKey.java |   2 +-
 ...nedStatsDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...edStatsDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...StatsDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...tatsDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...edStatsDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 ...VersionedStatsDiskRegionEntryHeapIntKey.java |   2 +-
 ...ersionedStatsDiskRegionEntryHeapLongKey.java |   2 +-
 ...sionedStatsDiskRegionEntryHeapObjectKey.java |   2 +-
 ...ionedStatsDiskRegionEntryHeapStringKey1.java |   2 +-
 ...ionedStatsDiskRegionEntryHeapStringKey2.java |   2 +-
 ...ersionedStatsDiskRegionEntryHeapUUIDKey.java |   2 +-
 ...sionedStatsDiskRegionEntryOffHeapIntKey.java |   2 +-
 ...ionedStatsDiskRegionEntryOffHeapLongKey.java |   2 +-
 ...nedStatsDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...edStatsDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...edStatsDiskRegionEntryOffHeapStringKey2.java |   2 +-
 ...ionedStatsDiskRegionEntryOffHeapUUIDKey.java |   2 +-
 ...rsionedThinDiskLRURegionEntryHeapIntKey.java |   2 +-
 ...sionedThinDiskLRURegionEntryHeapLongKey.java |   2 +-
 ...onedThinDiskLRURegionEntryHeapObjectKey.java |   2 +-
 ...nedThinDiskLRURegionEntryHeapStringKey1.java |   2 +-
 ...nedThinDiskLRURegionEntryHeapStringKey2.java |   2 +-
 ...sionedThinDiskLRURegionEntryHeapUUIDKey.java |   2 +-
 ...onedThinDiskLRURegionEntryOffHeapIntKey.java |   2 +-
 ...nedThinDiskLRURegionEntryOffHeapLongKey.java |   2 +-
 ...dThinDiskLRURegionEntryOffHeapObjectKey.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey1.java |   2 +-
 ...ThinDiskLRURegionEntryOffHeapStringKey2.java |   2 +-
 ...nedThinDiskLRURegionEntryOffHeapUUIDKey.java |   2 +-
 .../VersionedThinDiskRegionEntryHeapIntKey.java |   2 +-
 ...VersionedThinDiskRegionEntryHeapLongKey.java |   2 +-
 ...rsionedThinDiskRegionEntryHeapObjectKey.java |   2 +-
 ...sionedThinDiskRegionEntryHeapStringKey1.java |   2 +-
 ...sionedThinDiskRegionEntryHeapStringKey2.java |   2 +-
 ...VersionedThinDiskRegionEntryHeapUUIDKey.java |   2 +-
 ...rsionedThinDiskRegionEntryOffHeapIntKey.java |   2 +-
 ...sionedThinDiskRegionEntryOffHeapLongKey.java |   2 +-
 ...onedThinDiskRegionEntryOffHeapObjectKey.java |   2 +-
 ...nedThinDiskRegionEntryOffHeapStringKey1.java |   2 +-
 ...nedThinDiskRegionEntryOffHeapStringKey2.java |   2 +-
 ...sionedThinDiskRegionEntryOffHeapUUIDKey.java |   2 +-
 .../internal/cache/WrappedCallbackArgument.java |   2 +-
 .../cache/control/HeapMemoryMonitor.java        |   2 +-
 .../cache/control/MemoryThresholds.java         |   2 +-
 .../cache/control/OffHeapMemoryMonitor.java     |   2 +-
 .../internal/cache/control/ResourceAdvisor.java |   6 +-
 .../cache/control/ResourceListener.java         |   2 +-
 .../internal/cache/control/ResourceMonitor.java |   2 +-
 .../gemfire/internal/cache/delta/Delta.java     |   2 +-
 .../cache/execute/AbstractExecution.java        |   4 +-
 .../cache/execute/BucketMovedException.java     |   6 +-
 .../cache/execute/DefaultResultCollector.java   |   2 +-
 .../DistributedRegionFunctionExecutor.java      |   2 +-
 .../cache/execute/FunctionContextImpl.java      |   2 +-
 .../cache/execute/InternalExecution.java        |   4 +-
 .../execute/InternalFunctionException.java      |   2 +-
 .../cache/execute/InternalFunctionService.java  |  12 +-
 .../cache/execute/MemberMappedArgument.java     |   2 +-
 .../execute/MultiRegionFunctionContext.java     |   4 +-
 .../execute/MultiRegionFunctionContextImpl.java |   2 +-
 .../internal/cache/execute/NoResult.java        |   2 +-
 .../execute/RegionFunctionContextImpl.java      |   2 +-
 .../execute/ServerRegionFunctionExecutor.java   |   2 +-
 .../ServerToClientFunctionResultSender65.java   |   2 +-
 .../util/FindRestEnabledServersFunction.java    |   2 +-
 .../internal/cache/extension/Extensible.java    |   4 +-
 .../internal/cache/extension/Extension.java     |   6 +-
 .../cache/extension/ExtensionPoint.java         |  10 +-
 .../cache/extension/SimpleExtensionPoint.java   |   4 +-
 .../internal/cache/ha/HAContainerMap.java       |   2 +-
 .../internal/cache/ha/HAContainerRegion.java    |   2 +-
 .../internal/cache/ha/HAContainerWrapper.java   |   2 +-
 .../internal/cache/ha/HARegionQueue.java        |  30 ++---
 .../locks/TXLockUpdateParticipantsMessage.java  |   2 +-
 .../gemfire/internal/cache/lru/HeapEvictor.java |   2 +-
 .../cache/lru/HeapLRUCapacityController.java    |   4 +-
 .../internal/cache/lru/HeapLRUStatistics.java   |   2 +-
 .../internal/cache/lru/LRUAlgorithm.java        |   6 +-
 .../cache/lru/LRUCapacityController.java        |   4 +-
 .../internal/cache/lru/LRUClockNode.java        |   2 +-
 .../cache/lru/MemLRUCapacityController.java     |   4 +-
 .../internal/cache/lru/NewLIFOClockHand.java    |   2 +-
 .../internal/cache/lru/OffHeapEvictor.java      |   2 +-
 .../gemfire/internal/cache/lru/Sizeable.java    |   2 +-
 .../operations/ContainsKeyOperationContext.java |   2 +-
 .../AllBucketProfilesUpdateMessage.java         |   2 +-
 .../internal/cache/partitioned/Bucket.java      |   2 +-
 .../cache/partitioned/BucketBackupMessage.java  |   2 +-
 .../partitioned/BucketProfileUpdateMessage.java |   2 +-
 .../cache/partitioned/BucketSizeMessage.java    |   4 +-
 .../partitioned/ContainsKeyValueMessage.java    |   2 +-
 .../cache/partitioned/CreateBucketMessage.java  |   6 +-
 .../cache/partitioned/DestroyMessage.java       |   2 +-
 .../DestroyRegionOnDataStoreMessage.java        |   2 +-
 .../partitioned/FetchBulkEntriesMessage.java    |   4 +-
 .../cache/partitioned/FetchEntriesMessage.java  |   2 +-
 .../cache/partitioned/FetchEntryMessage.java    |   4 +-
 .../cache/partitioned/FetchKeysMessage.java     |   2 +-
 .../cache/partitioned/FlushMessage.java         |   2 +-
 .../internal/cache/partitioned/GetMessage.java  |   6 +-
 .../partitioned/IdentityRequestMessage.java     |   6 +-
 .../partitioned/IdentityUpdateMessage.java      |   2 +-
 .../cache/partitioned/InterestEventMessage.java |   6 +-
 .../cache/partitioned/InvalidateMessage.java    |   4 +-
 .../partitioned/ManageBackupBucketMessage.java  |   6 +-
 .../cache/partitioned/ManageBucketMessage.java  |   6 +-
 .../internal/cache/partitioned/PRLoad.java      |   2 +-
 .../PRLocallyDestroyedException.java            |   2 +-
 .../cache/partitioned/PRTombstoneMessage.java   |   2 +-
 .../cache/partitioned/PartitionMessage.java     |   6 +-
 .../partitioned/PrimaryRequestMessage.java      |   2 +-
 .../cache/partitioned/PutAllPRMessage.java      |   4 +-
 .../internal/cache/partitioned/PutMessage.java  |   4 +-
 .../cache/partitioned/RegionAdvisor.java        |   8 +-
 .../cache/partitioned/RemoteSizeMessage.java    |   4 +-
 .../cache/partitioned/RemoveAllPRMessage.java   |   4 +-
 .../internal/cache/partitioned/SizeMessage.java |   4 +-
 .../cache/partitioned/SizedBasedLoadProbe.java  |   2 +-
 .../rebalance/PartitionedRegionLoadModel.java   |   2 +-
 .../cache/persistence/BytesAndBits.java         |   2 +-
 .../cache/persistence/DiskRecoveryStore.java    |   2 +-
 .../persistence/PersistentMemberPattern.java    |   2 +-
 .../cache/persistence/query/IndexMap.java       |   4 +-
 .../cache/persistence/query/ResultBag.java      |   2 +-
 .../cache/persistence/query/ResultList.java     |   2 +-
 .../cache/persistence/query/ResultMap.java      |   4 +-
 .../cache/persistence/query/ResultSet.java      |   2 +-
 .../gemfire/internal/cache/properties.html      |   2 +-
 .../gemfire/internal/cache/tier/Acceptor.java   |   4 +-
 .../internal/cache/tier/BatchException.java     |   2 +-
 .../internal/cache/tier/CachedRegionHelper.java |   2 +-
 .../internal/cache/tier/ClientHandShake.java    |   2 +-
 .../internal/cache/tier/ConnectionProxy.java    |   4 +-
 .../internal/cache/tier/InterestType.java       |   2 +-
 .../cache/tier/InternalClientMembership.java    |   2 +-
 .../internal/cache/tier/MessageType.java        |  60 +++++-----
 .../cache/tier/sockets/AcceptorImpl.java        |  12 +-
 .../cache/tier/sockets/CacheClientNotifier.java |  22 ++--
 .../tier/sockets/CacheClientNotifierStats.java  |   2 +-
 .../cache/tier/sockets/CacheClientProxy.java    |  12 +-
 .../tier/sockets/CacheClientProxyStats.java     |   2 +-
 .../cache/tier/sockets/CacheClientUpdater.java  |   6 +-
 .../cache/tier/sockets/CacheServerHelper.java   |   2 +-
 .../cache/tier/sockets/ChunkedMessage.java      |   2 +-
 .../tier/sockets/ClientBlacklistProcessor.java  |   2 +-
 .../cache/tier/sockets/ClientHealthMonitor.java |   4 +-
 .../tier/sockets/ClientInstantiatorMessage.java |   2 +-
 .../tier/sockets/ClientInterestMessageImpl.java |   4 +-
 .../tier/sockets/ClientMarkerMessageImpl.java   |   2 +-
 .../cache/tier/sockets/ClientMessage.java       |   2 +-
 .../tier/sockets/ClientPingMessageImpl.java     |   2 +-
 .../tier/sockets/ClientProxyMembershipID.java   |  16 +--
 .../cache/tier/sockets/ClientUpdateMessage.java |   2 +-
 .../tier/sockets/ClientUpdateMessageImpl.java   |   4 +-
 .../cache/tier/sockets/CommandInitializer.java  |   2 +-
 .../cache/tier/sockets/ConnectionListener.java  |   2 +-
 .../tier/sockets/ConnectionListenerAdapter.java |   2 +-
 .../cache/tier/sockets/HAEventWrapper.java      |   2 +-
 .../internal/cache/tier/sockets/HandShake.java  |  14 +--
 .../tier/sockets/InterestResultPolicyImpl.java  |   2 +-
 .../internal/cache/tier/sockets/Message.java    |   2 +-
 .../cache/tier/sockets/MessageStats.java        |   2 +-
 .../cache/tier/sockets/ObjectPartList.java      |   2 +-
 .../internal/cache/tier/sockets/Part.java       |   6 +-
 .../RemoveClientFromBlacklistMessage.java       |   2 +-
 .../cache/tier/sockets/ServerConnection.java    |   2 +-
 .../tier/sockets/ServerHandShakeProcessor.java  |   4 +-
 .../cache/tier/sockets/ServerQueueStatus.java   |   2 +-
 .../tier/sockets/ServerResponseMatrix.java      |   2 +-
 .../cache/tier/sockets/VersionedObjectList.java |   2 +-
 .../tier/sockets/command/CommitCommand.java     |   2 +-
 .../tier/sockets/command/ExecuteFunction.java   |   2 +-
 .../tier/sockets/command/ExecuteFunction65.java |   2 +-
 .../tier/sockets/command/ExecuteFunction66.java |   2 +-
 .../sockets/command/ExecuteRegionFunction.java  |   2 +-
 .../command/ExecuteRegionFunction61.java        |   2 +-
 .../command/ExecuteRegionFunction65.java        |   2 +-
 .../command/ExecuteRegionFunction66.java        |   2 +-
 .../command/ExecuteRegionFunctionSingleHop.java |   2 +-
 .../command/GetClientPRMetadataCommand.java     |   2 +-
 .../command/GetClientPRMetadataCommand66.java   |   2 +-
 .../GetClientPartitionAttributesCommand.java    |   2 +-
 .../GetClientPartitionAttributesCommand66.java  |   2 +-
 .../cache/tier/sockets/command/GetEntry70.java  |  14 +--
 .../tier/sockets/command/GetEntryCommand.java   |   2 +-
 .../tier/sockets/command/ManagementCommand.java |   2 +-
 .../cache/tier/sockets/command/Put61.java       |   2 +-
 .../cache/tier/sockets/command/Put65.java       |   2 +-
 .../sockets/command/RegisterInterest61.java     |   2 +-
 .../sockets/command/RegisterInterestList61.java |   2 +-
 .../sockets/command/RegisterInterestList66.java |   2 +-
 .../cache/tier/sockets/command/RemoveAll.java   |   2 +-
 .../tier/sockets/command/RequestEventValue.java |   2 +-
 .../ConcurrentCacheModificationException.java   |   2 +-
 .../cache/wan/AbstractGatewaySender.java        |   2 +-
 .../AbstractGatewaySenderEventProcessor.java    |   2 +-
 .../internal/cache/wan/BatchException70.java    |   2 +-
 .../cache/wan/GatewayReceiverException.java     |   2 +-
 .../GatewaySenderConfigurationException.java    |   2 +-
 .../wan/GatewaySenderEventCallbackArgument.java |   2 +-
 .../GatewaySenderEventCallbackDispatcher.java   |   2 +-
 .../cache/wan/GatewaySenderEventDispatcher.java |   2 +-
 .../cache/wan/GatewaySenderEventImpl.java       |   2 +-
 .../ParallelQueueBatchRemovalMessage.java       |   2 +-
 .../parallel/ParallelQueueRemovalMessage.java   |   2 +-
 .../SerialGatewaySenderEventProcessor.java      |   2 +-
 .../wan/serial/SerialGatewaySenderQueue.java    |   2 +-
 .../serial/SerialSecondaryGatewayListener.java  |   2 +-
 .../cache/xmlcache/AbstractXmlParser.java       |   2 +-
 .../internal/cache/xmlcache/CacheCreation.java  |  34 +++---
 .../cache/xmlcache/CacheServerCreation.java     |   2 +-
 .../CacheTransactionManagerCreation.java        |   2 +-
 .../internal/cache/xmlcache/CacheXml.java       |  42 +++----
 .../cache/xmlcache/CacheXmlGenerator.java       |  18 +--
 .../internal/cache/xmlcache/CacheXmlParser.java |  34 +++---
 .../xmlcache/CacheXmlPropertyResolver.java      |   2 +-
 .../CacheXmlPropertyResolverHelper.java         |   2 +-
 .../cache/xmlcache/CacheXmlVersion.java         |  12 +-
 .../cache/xmlcache/ClientCacheCreation.java     |   8 +-
 .../cache/xmlcache/ClientHaQueueCreation.java   |   2 +-
 .../internal/cache/xmlcache/Declarable2.java    |   2 +-
 .../cache/xmlcache/DefaultEntityResolver2.java  |   4 +-
 .../xmlcache/DiskStoreAttributesCreation.java   |   2 +-
 .../cache/xmlcache/GeodeEntityResolver.java     |   2 +-
 .../cache/xmlcache/PivotalEntityResolver.java   |   2 +-
 .../cache/xmlcache/PropertyResolver.java        |   2 +-
 .../xmlcache/RegionAttributesCreation.java      |  34 +++---
 .../internal/cache/xmlcache/RegionCreation.java |  14 +--
 .../cache/xmlcache/ResourceManagerCreation.java |   2 +-
 .../internal/cache/xmlcache/XmlGenerator.java   |   8 +-
 .../cache/xmlcache/XmlGeneratorUtils.java       |  12 +-
 .../internal/cache/xmlcache/XmlParser.java      |   6 +-
 .../internal/cache/xmlcache/package.html        |   2 +-
 .../concurrent/CompactConcurrentHashSet2.java   |   6 +-
 .../internal/concurrent/MapCallback.java        |   2 +-
 .../gemfire/internal/concurrent/MapResult.java  |   2 +-
 .../i18n/AbstractStringIdResourceBundle.java    |   2 +-
 .../gemfire/internal/i18n/LocalizedStrings.java |   2 +-
 .../internal/i18n/ParentLocalizedStrings.java   |   2 +-
 .../gemfire/internal/i18n/StringId.java         |   2 +-
 .../internal/io/CompositeOutputStream.java      |   2 +-
 .../internal/io/CompositePrintStream.java       |   2 +-
 .../gemfire/internal/io/TeeOutputStream.java    |   2 +-
 .../gemfire/internal/io/TeePrintStream.java     |   2 +-
 .../gemfire/internal/jta/GlobalTransaction.java |   2 +-
 .../internal/jta/TransactionManagerImpl.java    |   2 +-
 .../internal/jta/UserTransactionImpl.java       |   2 +-
 .../gemstone/gemfire/internal/jta/XidImpl.java  |   2 +-
 .../gemfire/internal/lang/ClassUtils.java       |   2 +-
 .../gemstone/gemfire/internal/lang/Filter.java  |   2 +-
 .../gemfire/internal/lang/InOutParameter.java   |   2 +-
 .../gemfire/internal/lang/Initable.java         |   2 +-
 .../gemfire/internal/lang/Initializer.java      |   2 +-
 .../internal/lang/MutableIdentifiable.java      |   2 +-
 .../gemfire/internal/lang/ObjectUtils.java      |   2 +-
 .../gemfire/internal/lang/Orderable.java        |   2 +-
 .../gemstone/gemfire/internal/lang/Ordered.java |   2 +-
 .../gemfire/internal/lang/StringUtils.java      |   2 +-
 .../gemfire/internal/lang/SystemUtils.java      |   2 +-
 .../gemfire/internal/lang/ThreadUtils.java      |   2 +-
 .../internal/logging/DebugLogWriter.java        |   4 +-
 .../internal/logging/LocalLogWriter.java        |   2 +-
 .../gemfire/internal/logging/LogFileParser.java |   2 +-
 .../gemfire/internal/logging/LogWriterImpl.java |  66 +++++-----
 .../internal/logging/LoggingThreadGroup.java    |  10 +-
 .../internal/logging/ManagerLogWriter.java      |   4 +-
 .../gemfire/internal/logging/MergeLogFiles.java |   2 +-
 .../logging/SecurityLocalLogWriter.java         |   2 +-
 .../internal/logging/SecurityLogWriter.java     |   2 +-
 .../logging/SecurityManagerLogWriter.java       |   2 +-
 .../gemfire/internal/logging/SortLogFile.java   |   2 +-
 .../modules/util/RegionConfiguration.java       |   2 +-
 .../gemfire/internal/net/SocketUtils.java       |   2 +-
 .../gemfire/internal/offheap/DataType.java      |   2 +-
 .../internal/offheap/MemoryAllocator.java       |   2 +-
 .../internal/offheap/MemoryAllocatorImpl.java   |   2 +-
 .../gemfire/internal/offheap/MemoryBlock.java   |   2 +-
 .../internal/offheap/MemoryInspector.java       |   2 +-
 .../internal/offheap/MemoryUsageListener.java   |   2 +-
 .../gemfire/internal/offheap/OffHeapHelper.java |   2 +-
 .../internal/offheap/OffHeapMemoryStats.java    |   2 +-
 .../offheap/OffHeapRegionEntryHelper.java       |   2 +-
 .../internal/offheap/OffHeapStorage.java        |   2 +-
 .../offheap/OutOfOffHeapMemoryListener.java     |   2 +-
 .../gemfire/internal/offheap/Releasable.java    |   2 +-
 .../gemfire/internal/offheap/SlabImpl.java      |   2 +-
 .../gemfire/internal/offheap/StoredObject.java  |   2 +-
 .../internal/process/AttachProcessUtils.java    |   2 +-
 .../process/BlockingProcessStreamReader.java    |   2 +-
 ...usterConfigurationNotAvailableException.java |   2 +-
 .../process/ConnectionFailedException.java      |   2 +-
 .../internal/process/ControlFileWatchdog.java   |   2 +-
 .../process/ControlNotificationHandler.java     |   2 +-
 .../internal/process/ControllableProcess.java   |   2 +-
 .../process/FileAlreadyExistsException.java     |   2 +-
 .../process/FileControllerParameters.java       |   2 +-
 .../internal/process/FileProcessController.java |   2 +-
 .../process/LocalProcessController.java         |   2 +-
 .../internal/process/LocalProcessLauncher.java  |   2 +-
 .../process/MBeanControllerParameters.java      |   2 +-
 .../process/MBeanInvocationFailedException.java |   2 +-
 .../process/MBeanProcessController.java         |   2 +-
 .../internal/process/NativeProcessUtils.java    |   2 +-
 .../process/NonBlockingProcessStreamReader.java |   2 +-
 .../gemfire/internal/process/PidFile.java       |   2 +-
 .../process/PidUnavailableException.java        |   2 +-
 .../internal/process/ProcessController.java     |   2 +-
 .../process/ProcessControllerFactory.java       |   2 +-
 .../process/ProcessControllerParameters.java    |   2 +-
 .../process/ProcessLauncherContext.java         |   2 +-
 .../internal/process/ProcessStreamReader.java   |   4 +-
 .../ProcessTerminatedAbnormallyException.java   |   2 +-
 .../gemfire/internal/process/ProcessType.java   |   2 +-
 .../gemfire/internal/process/ProcessUtils.java  |   2 +-
 .../gemfire/internal/process/StartupStatus.java |   2 +-
 .../UnableToControlProcessException.java        |   2 +-
 .../AbstractSignalNotificationHandler.java      |   2 +-
 .../gemfire/internal/process/signal/Signal.java |   2 +-
 .../internal/process/signal/SignalEvent.java    |   2 +-
 .../internal/process/signal/SignalListener.java |   2 +-
 .../internal/process/signal/SignalType.java     |   2 +-
 .../internal/security/AuthorizeRequest.java     |   2 +-
 .../internal/security/AuthorizeRequestPP.java   |   2 +-
 .../security/FilterPostAuthorization.java       |   2 +-
 .../security/FilterPreAuthorization.java        |   2 +-
 .../gemfire/internal/shared/NativeCalls.java    |   6 +-
 .../internal/shared/NativeCallsJNAImpl.java     |   2 +-
 .../internal/shared/NativeErrorException.java   |   2 +-
 .../internal/shared/TCPSocketOptions.java       |   2 +-
 .../internal/statistics/CounterMonitor.java     |   2 +-
 .../internal/statistics/GaugeMonitor.java       |   2 +-
 .../statistics/IgnoreResourceException.java     |   2 +-
 .../MapBasedStatisticsNotification.java         |   2 +-
 .../internal/statistics/ResourceInstance.java   |   2 +-
 .../internal/statistics/ResourceType.java       |   2 +-
 .../internal/statistics/SampleCollector.java    |   6 +-
 .../internal/statistics/SampleHandler.java      |   2 +-
 .../internal/statistics/SimpleStatisticId.java  |   2 +-
 .../statistics/StatArchiveDescriptor.java       |   2 +-
 .../internal/statistics/StatArchiveHandler.java |   2 +-
 .../statistics/StatArchiveHandlerConfig.java    |   2 +-
 .../internal/statistics/StatMonitorHandler.java |   6 +-
 .../internal/statistics/StatisticId.java        |   2 +-
 .../statistics/StatisticNotFoundException.java  |   2 +-
 .../internal/statistics/StatisticsListener.java |   2 +-
 .../internal/statistics/StatisticsMonitor.java  |   2 +-
 .../statistics/StatisticsNotification.java      |   2 +-
 .../internal/statistics/StatisticsSampler.java  |   2 +-
 .../internal/statistics/ValueMonitor.java       |   2 +-
 .../stats50/Atomic50StatisticsImpl.java         |   4 +-
 .../gemfire/internal/tcp/BaseMsgStreamer.java   |   2 +-
 .../internal/tcp/ByteBufferInputStream.java     |   2 +-
 .../gemfire/internal/tcp/ConnectExceptions.java |   2 +-
 .../gemfire/internal/tcp/Connection.java        |  12 +-
 .../internal/tcp/ConnectionException.java       |   2 +-
 .../gemfire/internal/tcp/ConnectionTable.java   |   4 +-
 .../tcp/ImmutableByteBufferInputStream.java     |   2 +-
 .../gemfire/internal/tcp/MsgDestreamer.java     |   2 +-
 .../gemfire/internal/tcp/MsgIdGenerator.java    |   2 +-
 .../gemfire/internal/tcp/MsgOutputStream.java   |   2 +-
 .../gemfire/internal/tcp/MsgStreamer.java       |   2 +-
 .../gemfire/internal/tcp/MsgStreamerList.java   |   2 +-
 .../gemfire/internal/tcp/ServerDelegate.java    |   2 +-
 .../gemfire/internal/tcp/TCPConduit.java        |  10 +-
 .../tcp/VersionedByteBufferInputStream.java     |   2 +-
 .../internal/tcp/VersionedMsgStreamer.java      |   2 +-
 .../gemfire/internal/util/Breadcrumbs.java      |   2 +-
 .../gemfire/internal/util/CollectionUtils.java  |   8 +-
 .../gemstone/gemfire/internal/util/IOUtils.java |   2 +-
 .../gemfire/internal/util/LogFileUtils.java     |   2 +-
 .../internal/util/StackTraceCollector.java      |   2 +-
 .../internal/util/SunAPINotFoundException.java  |   2 +-
 .../gemfire/internal/util/Versionable.java      |   2 +-
 .../CustomEntryConcurrentHashMap.java           |   8 +-
 .../lang/AttachAPINotFoundException.java        |   2 +-
 .../com/gemstone/gemfire/lang/Identifiable.java |   2 +-
 .../management/AlreadyRunningException.java     |   2 +-
 .../management/AsyncEventQueueMXBean.java       |   2 +-
 .../gemfire/management/CacheServerMXBean.java   |   2 +-
 .../gemfire/management/ClientHealthStatus.java  |   2 +-
 .../gemfire/management/ClientQueueDetail.java   |   2 +-
 .../DependenciesNotFoundException.java          |   2 +-
 .../gemfire/management/DiskBackupResult.java    |   2 +-
 .../gemfire/management/DiskBackupStatus.java    |   2 +-
 .../gemfire/management/DiskMetrics.java         |   2 +-
 .../gemfire/management/DiskStoreMXBean.java     |   6 +-
 .../DistributedLockServiceMXBean.java           |   2 +-
 .../management/DistributedRegionMXBean.java     |   2 +-
 .../management/DistributedSystemMXBean.java     |   2 +-
 .../management/EvictionAttributesData.java      |   2 +-
 .../FixedPartitionAttributesData.java           |   2 +-
 .../management/GatewayReceiverMXBean.java       |   2 +-
 .../gemfire/management/GatewaySenderMXBean.java |   2 +-
 .../gemfire/management/GemFireProperties.java   |   2 +-
 .../gemfire/management/JMXNotificationType.java |   2 +-
 .../management/JMXNotificationUserData.java     |   2 +-
 .../gemstone/gemfire/management/JVMMetrics.java |   2 +-
 .../gemfire/management/LocatorMXBean.java       |   2 +-
 .../gemfire/management/LockServiceMXBean.java   |   2 +-
 .../gemfire/management/ManagementException.java |   2 +-
 .../gemfire/management/ManagementService.java   |   2 +-
 .../gemfire/management/ManagerMXBean.java       |   2 +-
 .../gemfire/management/MemberMXBean.java        |   2 +-
 .../gemfire/management/NetworkMetrics.java      |   2 +-
 .../gemstone/gemfire/management/OSMetrics.java  |   2 +-
 .../management/PartitionAttributesData.java     |   2 +-
 .../management/PersistentMemberDetails.java     |   2 +-
 .../management/RegionAttributesData.java        |   2 +-
 .../gemfire/management/RegionMXBean.java        |   2 +-
 .../gemfire/management/ServerLoadData.java      |   2 +-
 .../gemfire/management/cli/CliMetaData.java     |   6 +-
 .../cli/CommandProcessingException.java         |   2 +-
 .../gemfire/management/cli/CommandService.java  |   2 +-
 .../management/cli/CommandServiceException.java |   2 +-
 .../management/cli/CommandStatement.java        |   2 +-
 .../gemfire/management/cli/ConverterHint.java   |   2 +-
 .../gemstone/gemfire/management/cli/Result.java |   4 +-
 .../internal/BaseManagementService.java         |   2 +-
 .../management/internal/FederatingManager.java  |   2 +-
 .../management/internal/JettyHelper.java        |   2 +-
 .../management/internal/JmxManagerAdvisee.java  |   2 +-
 .../management/internal/JmxManagerAdvisor.java  |   2 +-
 .../internal/JmxManagerLocatorRequest.java      |   2 +-
 .../internal/JmxManagerLocatorResponse.java     |   2 +-
 .../management/internal/ManagementAgent.java    |   2 +-
 .../gemfire/management/internal/Manager.java    |   2 +-
 .../gemfire/management/internal/RestAgent.java  |   2 +-
 .../gemfire/management/internal/SSLUtil.java    |   2 +-
 .../internal/SystemManagementService.java       |   2 +-
 .../cli/AbstractCliAroundInterceptor.java       |   2 +-
 .../internal/cli/CliAroundInterceptor.java      |   2 +-
 .../management/internal/cli/CliUtil.java        |   2 +-
 .../management/internal/cli/CommandManager.java |   4 +-
 .../management/internal/cli/CommandRequest.java |   2 +-
 .../internal/cli/CommandResponse.java           |   2 +-
 .../internal/cli/CommandResponseBuilder.java    |   2 +-
 .../internal/cli/CommandResponseWriter.java     |   2 +-
 .../internal/cli/GfshParseResult.java           |   2 +-
 .../management/internal/cli/GfshParser.java     |   2 +-
 .../management/internal/cli/Launcher.java       |   2 +-
 .../management/internal/cli/LogWrapper.java     |   6 +-
 .../internal/cli/annotation/CliArgument.java    |   2 +-
 .../cli/commands/AbstractCommandsSupport.java   |   2 +-
 .../internal/cli/commands/ClientCommands.java   |   2 +-
 .../internal/cli/commands/ConfigCommands.java   |   2 +-
 .../CreateAlterDestroyRegionCommands.java       |   2 +-
 .../internal/cli/commands/DataCommands.java     |   2 +-
 .../internal/cli/commands/DeployCommands.java   |   2 +-
 .../cli/commands/DiskStoreCommands.java         |   2 +-
 .../internal/cli/commands/FunctionCommands.java |   2 +-
 .../internal/cli/commands/GfshHelpCommands.java |   2 +-
 .../internal/cli/commands/IndexCommands.java    |   2 +-
 .../cli/commands/LauncherLifecycleCommands.java |   2 +-
 .../internal/cli/commands/MemberCommands.java   |   2 +-
 .../cli/commands/MiscellaneousCommands.java     |   2 +-
 .../internal/cli/commands/QueueCommands.java    |   2 +-
 .../internal/cli/commands/RegionCommands.java   |   2 +-
 .../internal/cli/commands/ShellCommands.java    |   3 +-
 .../cli/converters/BooleanConverter.java        |   2 +-
 .../ClusterMemberIdNameConverter.java           |   2 +-
 .../internal/cli/converters/DirConverter.java   |   2 +-
 .../cli/converters/DirPathConverter.java        |   2 +-
 .../cli/converters/DiskStoreNameConverter.java  |   2 +-
 .../internal/cli/converters/EnumConverter.java  |   2 +-
 .../cli/converters/FilePathConverter.java       |   2 +-
 .../cli/converters/FilePathStringConverter.java |   2 +-
 .../converters/GatewaySenderIdConverter.java    |   2 +-
 .../internal/cli/converters/HelpConverter.java  |   2 +-
 .../cli/converters/HintTopicConverter.java      |   2 +-
 .../LocatorDiscoveryConfigConverter.java        |   2 +-
 .../cli/converters/LocatorIdNameConverter.java  |   2 +-
 .../cli/converters/LogLevelConverter.java       |   2 +-
 .../cli/converters/MemberGroupConverter.java    |   2 +-
 .../cli/converters/MemberIdNameConverter.java   |   2 +-
 .../cli/converters/RegionPathConverter.java     |   2 +-
 .../cli/converters/StringArrayConverter.java    |   2 +-
 .../cli/converters/StringListConverter.java     |   2 +-
 .../cli/domain/AsyncEventQueueDetails.java      |   2 +-
 .../cli/domain/ConnectToLocatorResult.java      |   2 +-
 .../internal/cli/domain/DiskStoreDetails.java   |   2 +-
 .../internal/cli/domain/IndexDetails.java       |   2 +-
 .../exceptions/CreateSubregionException.java    |   2 +-
 .../cli/functions/ContunuousQueryFunction.java  |   2 +-
 .../CreateAsyncEventQueueFunction.java          |   2 +-
 .../cli/functions/CreateDiskStoreFunction.java  |   2 +-
 .../functions/DescribeDiskStoreFunction.java    |   2 +-
 .../cli/functions/DestroyDiskStoreFunction.java |   2 +-
 .../FetchRegionAttributesFunction.java          |   2 +-
 .../functions/ListAsyncEventQueuesFunction.java |   2 +-
 .../cli/functions/ListDiskStoresFunction.java   |   2 +-
 .../functions/ListDurableCqNamesFunction.java   |   2 +-
 .../cli/functions/ListIndexFunction.java        |   2 +-
 .../internal/cli/functions/LogFileFunction.java |   2 +-
 .../cli/functions/MembersForRegionFunction.java |   2 +-
 .../internal/cli/functions/NetstatFunction.java |   2 +-
 .../cli/functions/RegionAlterFunction.java      |   2 +-
 .../cli/functions/RegionCreateFunction.java     |   2 +-
 .../cli/functions/RegionDestroyFunction.java    |   2 +-
 .../cli/functions/RegionFunctionArgs.java       |   2 +-
 .../cli/functions/UserFunctionExecution.java    |   2 +-
 .../management/internal/cli/help/CliTopic.java  |   2 +-
 .../internal/cli/help/format/NewHelp.java       |   2 +-
 .../internal/cli/help/utils/HelpUtils.java      |   2 +-
 .../internal/cli/i18n/CliStrings.java           |   2 +-
 .../internal/cli/json/GfJsonArray.java          |   2 +-
 .../internal/cli/json/GfJsonException.java      |   2 +-
 .../internal/cli/json/GfJsonObject.java         |   2 +-
 .../internal/cli/parser/Argument.java           |   2 +-
 .../internal/cli/parser/AvailabilityTarget.java |   2 +-
 .../internal/cli/parser/CommandTarget.java      |   2 +-
 .../internal/cli/parser/GfshMethodTarget.java   |   2 +-
 .../internal/cli/parser/GfshOptionParser.java   |   2 +-
 .../internal/cli/parser/MethodParameter.java    |   2 +-
 .../management/internal/cli/parser/Option.java  |   2 +-
 .../internal/cli/parser/OptionSet.java          |   2 +-
 .../internal/cli/parser/Parameter.java          |   2 +-
 .../internal/cli/parser/ParserUtils.java        |   2 +-
 .../internal/cli/parser/SyntaxConstants.java    |   2 +-
 .../cli/parser/jopt/JoptOptionParser.java       |   2 +-
 .../preprocessor/EnclosingCharacters.java       |   2 +-
 .../cli/parser/preprocessor/Preprocessor.java   |   2 +-
 .../parser/preprocessor/PreprocessorUtils.java  |   2 +-
 .../cli/parser/preprocessor/TrimmedInput.java   |   2 +-
 .../cli/remote/CommandExecutionContext.java     |   2 +-
 .../internal/cli/remote/CommandProcessor.java   |   2 +-
 .../cli/remote/CommandStatementImpl.java        |   2 +-
 .../cli/remote/RemoteExecutionStrategy.java     |   2 +-
 .../internal/cli/remote/WrapperThreadLocal.java |   2 +-
 .../internal/cli/result/AbstractResultData.java |   2 +-
 .../cli/result/CliJsonSerializable.java         |   2 +-
 .../cli/result/CliJsonSerializableIds.java      |   2 +-
 .../internal/cli/result/CommandResult.java      |   2 +-
 .../cli/result/CommandResultException.java      |   2 +-
 .../cli/result/CompositeResultData.java         |   4 +-
 .../internal/cli/result/ErrorResultData.java    |   2 +-
 .../internal/cli/result/FileResult.java         |   2 +-
 .../internal/cli/result/InfoResultData.java     |   2 +-
 .../internal/cli/result/ObjectResultData.java   |   2 +-
 .../internal/cli/result/ResultBuilder.java      |   2 +-
 .../internal/cli/result/ResultData.java         |   2 +-
 .../cli/result/ResultDataException.java         |   2 +-
 .../internal/cli/result/TableBuilder.java       |   4 +-
 .../internal/cli/result/TabularResultData.java  |   2 +-
 .../management/internal/cli/shell/Gfsh.java     |   2 +-
 .../internal/cli/shell/GfshConfig.java          |   2 +-
 .../cli/shell/GfshExecutionStrategy.java        |   2 +-
 .../cli/shell/JMXConnectionException.java       |   2 +-
 .../cli/shell/JMXInvocationException.java       |   2 +-
 .../internal/cli/shell/JmxOperationInvoker.java |   4 +-
 .../internal/cli/shell/OperationInvoker.java    |   2 +-
 .../internal/cli/shell/jline/ANSIHandler.java   |   2 +-
 .../internal/cli/shell/jline/GfshHistory.java   |   2 +-
 .../shell/jline/GfshUnsupportedTerminal.java    |   2 +-
 .../internal/cli/util/CauseFinder.java          |   2 +-
 .../cli/util/ClasspathScanLoadHelper.java       |   4 +-
 .../internal/cli/util/CommandStringBuilder.java |   2 +-
 .../internal/cli/util/CommentSkipHelper.java    |   2 +-
 .../internal/cli/util/DiskStoreCompacter.java   |   2 +-
 .../cli/util/DiskStoreNotFoundException.java    |   2 +-
 .../internal/cli/util/DiskStoreValidater.java   |   2 +-
 .../internal/cli/util/GfshConsoleReader.java    |   2 +-
 .../cli/util/JConsoleNotFoundException.java     |   2 +-
 .../management/internal/cli/util/JsonUtil.java  |   2 +-
 .../cli/util/MemberNotFoundException.java       |   2 +-
 .../management/internal/cli/util/MergeLogs.java |   2 +-
 .../internal/cli/util/ReadWriteFile.java        |   2 +-
 .../internal/cli/util/RegionPath.java           |   2 +-
 .../cli/util/VisualVmNotFoundException.java     |   2 +-
 .../configuration/domain/CacheElement.java      |  10 +-
 .../configuration/domain/XmlEntity.java         |  30 ++---
 .../configuration/utils/XmlConstants.java       |   8 +-
 .../internal/configuration/utils/XmlUtils.java  |  18 +--
 .../internal/messages/CompactRequest.java       |   2 +-
 .../internal/messages/CompactResponse.java      |   2 +-
 .../internal/security/AccessControlMBean.java   |   2 +-
 .../internal/security/AccessControlMXBean.java  |   2 +-
 .../internal/security/MBeanServerWrapper.java   |   2 +-
 .../controllers/AbstractCommandsController.java |   2 +-
 .../AbstractMultiPartCommandsController.java    |   2 +-
 .../controllers/ClientCommandsController.java   |   2 +-
 .../controllers/ClusterCommandsController.java  |   2 +-
 .../controllers/ConfigCommandsController.java   |   2 +-
 .../web/controllers/DataCommandsController.java |   2 +-
 .../controllers/DeployCommandsController.java   |   2 +-
 .../DiskStoreCommandsController.java            |   2 +-
 .../DurableClientCommandsController.java        |   2 +-
 .../controllers/FunctionCommandsController.java |   2 +-
 .../controllers/IndexCommandsController.java    |   2 +-
 .../LauncherLifecycleCommandsController.java    |   2 +-
 .../controllers/MemberCommandsController.java   |   2 +-
 .../MiscellaneousCommandsController.java        |   2 +-
 .../web/controllers/PdxCommandsController.java  |   2 +-
 .../controllers/QueueCommandsController.java    |   2 +-
 .../controllers/RegionCommandsController.java   |   2 +-
 .../controllers/ShellCommandsController.java    |   2 +-
 .../web/controllers/WanCommandsController.java  |   2 +-
 .../support/LoginHandlerInterceptor.java        |   2 +-
 .../management/internal/web/domain/Link.java    |   2 +-
 .../internal/web/domain/LinkIndex.java          |   2 +-
 .../web/domain/QueryParameterSource.java        |   2 +-
 .../internal/web/http/ClientHttpRequest.java    |   2 +-
 .../internal/web/http/HttpHeader.java           |   2 +-
 .../internal/web/http/HttpMethod.java           |   2 +-
 .../SerializableObjectHttpMessageConverter.java |   2 +-
 .../web/http/support/SimpleHttpRequester.java   |   2 +-
 .../internal/web/io/MultipartFileAdapter.java   |   2 +-
 .../web/io/MultipartFileResourceAdapter.java    |   2 +-
 .../web/shell/AbstractHttpOperationInvoker.java |   2 +-
 .../web/shell/HttpOperationInvoker.java         |   2 +-
 .../web/shell/MBeanAccessException.java         |   2 +-
 .../RestApiCallForCommandNotFoundException.java |   2 +-
 .../web/shell/RestHttpOperationInvoker.java     |   2 +-
 .../web/shell/SimpleHttpOperationInvoker.java   |   2 +-
 .../shell/support/HttpInvocationHandler.java    |   2 +-
 .../shell/support/HttpMBeanProxyFactory.java    |   2 +-
 .../internal/web/util/ConvertUtils.java         |   2 +-
 .../management/internal/web/util/UriUtils.java  |   2 +-
 .../management/membership/ClientMembership.java |   2 +-
 .../membership/ClientMembershipEvent.java       |   2 +-
 .../membership/ClientMembershipListener.java    |   2 +-
 .../ClientMembershipListenerAdapter.java        |   2 +-
 .../management/membership/MembershipEvent.java  |   4 +-
 .../membership/MembershipListener.java          |   2 +-
 .../UniversalMembershipListenerAdapter.java     |   2 +-
 .../com/gemstone/gemfire/pdx/FieldType.java     |   2 +-
 .../gemfire/pdx/NonPortableClassException.java  |   2 +-
 .../gemfire/pdx/PdxConfigurationException.java  |   2 +-
 .../pdx/PdxFieldAlreadyExistsException.java     |   2 +-
 .../pdx/PdxFieldDoesNotExistException.java      |   2 +-
 .../pdx/PdxFieldTypeMismatchException.java      |   2 +-
 .../gemfire/pdx/PdxInitializationException.java |   2 +-
 .../com/gemstone/gemfire/pdx/PdxInstance.java   |   4 +-
 .../gemfire/pdx/PdxInstanceFactory.java         |   8 +-
 .../com/gemstone/gemfire/pdx/PdxReader.java     |   2 +-
 .../gemstone/gemfire/pdx/PdxSerializable.java   |   2 +-
 .../gemfire/pdx/PdxSerializationException.java  |   2 +-
 .../com/gemstone/gemfire/pdx/PdxSerializer.java |   2 +-
 .../gemstone/gemfire/pdx/PdxUnreadFields.java   |   2 +-
 .../com/gemstone/gemfire/pdx/PdxWriter.java     |   8 +-
 .../pdx/ReflectionBasedAutoSerializer.java      |  30 ++---
 .../gemfire/pdx/WritablePdxInstance.java        |   2 +-
 .../pdx/internal/AutoSerializableManager.java   |   2 +-
 .../gemstone/gemfire/pdx/internal/DataSize.java |   2 +-
 .../gemfire/pdx/internal/InternalPdxReader.java |   2 +-
 .../gemstone/gemfire/pdx/internal/PdxField.java |   2 +-
 .../gemfire/pdx/internal/PdxInputStream.java    |   2 +-
 .../gemfire/pdx/internal/PdxInstanceEnum.java   |   2 +-
 .../pdx/internal/PdxInstanceInputStream.java    |   2 +-
 .../gemfire/pdx/internal/PdxReaderImpl.java     |   2 +-
 .../gemfire/pdx/internal/PdxString.java         |   2 +-
 .../gemstone/gemfire/pdx/internal/PdxType.java  |   2 +-
 .../gemfire/pdx/internal/PdxUnreadData.java     |   2 +-
 .../gemfire/pdx/internal/PdxWriterImpl.java     |   2 +-
 .../pdx/internal/TrackingPdxReaderImpl.java     |   2 +-
 .../gemfire/pdx/internal/UnreadPdxType.java     |   2 +-
 .../internal/WeakConcurrentIdentityHashMap.java |   2 +-
 .../gemfire/security/AccessControl.java         |   2 +-
 .../gemfire/security/AuthInitialize.java        |   2 +-
 .../security/AuthenticationFailedException.java |   2 +-
 .../AuthenticationRequiredException.java        |   2 +-
 .../gemfire/security/Authenticator.java         |   2 +-
 .../security/GemFireSecurityException.java      |   2 +-
 .../security/NotAuthorizedException.java        |   2 +-
 .../src/test/java/cacheRunner/Portfolio.java    |   2 +-
 .../src/test/java/cacheRunner/Position.java     |   2 +-
 .../src/test/java/com/company/app/Customer.java |   2 +-
 .../src/test/java/com/company/app/DBLoader.java |   2 +-
 .../com/company/app/OrdersCacheListener.java    |   2 +-
 .../java/com/company/data/DatabaseLoader.java   |   2 +-
 .../java/com/company/data/MyDeclarable.java     |   2 +-
 .../src/test/java/com/company/data/MySizer.java |   2 +-
 .../com/company/data/MyTransactionListener.java |   2 +-
 .../src/test/java/com/examples/LinkNode.java    |   2 +-
 .../src/test/java/com/examples/SuperClass.java  |   2 +-
 .../src/test/java/com/examples/TestObject.java  |   2 +-
 .../com/examples/ds/PutDataSerializables.java   |   2 +-
 .../com/gemstone/gemfire/CopyJUnitTest.java     |   2 +-
 .../com/gemstone/gemfire/DeltaTestImpl.java     |   2 +-
 .../gemfire/JtaNoninvolvementJUnitTest.java     |   2 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |   2 +-
 .../java/com/gemstone/gemfire/TXJUnitTest.java  |   2 +-
 .../com/gemstone/gemfire/UnitTestDoclet.java    |   2 +-
 .../BindDistributedSystemJUnitTest.java         |   2 +-
 .../internal/CacheHealthEvaluatorJUnitTest.java |   2 +-
 .../internal/DistributedSystemTestCase.java     |   2 +-
 .../admin/internal/HealthEvaluatorTestCase.java |   2 +-
 .../MemberHealthEvaluatorJUnitTest.java         |   2 +-
 .../cache/AttributesFactoryJUnitTest.java       |   8 +-
 .../gemfire/cache/CacheListenerJUnitTest.java   |   2 +-
 .../gemfire/cache/ConnectionPoolDUnitTest.java  |  30 ++---
 ...alStaticArrayShouldNotCauseSegFaultTest.java |   2 +-
 .../gemfire/cache/PoolManagerJUnitTest.java     |   2 +-
 .../gemstone/gemfire/cache/ProxyJUnitTest.java  |   2 +-
 .../gemfire/cache/RegionFactoryJUnitTest.java   |   2 +-
 .../client/ClientCacheFactoryJUnitTest.java     |   2 +-
 .../client/ClientRegionFactoryJUnitTest.java    |   2 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   2 +-
 .../locator/LocatorStatusResponseJUnitTest.java |   2 +-
 .../management/MXMemoryPoolListenerExample.java |   2 +-
 .../management/MemoryThresholdsDUnitTest.java   |   2 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   2 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |   2 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   2 +-
 .../QueryObjectSerializationJUnitTest.java      |   2 +-
 .../NewDeclarativeIndexCreationJUnitTest.java   |   2 +-
 .../gemfire/cache30/Bug34387DUnitTest.java      |   2 +-
 .../gemfire/cache30/Bug34948DUnitTest.java      |   2 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   2 +-
 .../gemfire/cache30/Bug38013DUnitTest.java      |   2 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |   4 +-
 .../gemfire/cache30/Bug40662JUnitTest.java      |   2 +-
 .../gemfire/cache30/Bug44418JUnitTest.java      |   2 +-
 .../gemfire/cache30/CacheCloseDUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheListenerTestCase.java  |   2 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |   2 +-
 .../gemfire/cache30/CacheLogRollDUnitTest.java  |   2 +-
 .../cache30/CacheSerializableRunnable.java      |   2 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   2 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |   2 +-
 .../gemfire/cache30/CacheWriterTestCase.java    |   2 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   4 +-
 .../gemfire/cache30/CacheXml40DUnitTest.java    |  12 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |  12 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |   6 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml55DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |   6 +-
 .../gemfire/cache30/CacheXml58DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml60DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml61DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml65DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml66DUnitTest.java    |   2 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |   8 +-
 .../cache30/CachedAllEventsDUnitTest.java       |   2 +-
 .../gemfire/cache30/CallbackArgDUnitTest.java   |   2 +-
 .../cache30/ClientMembershipDUnitTest.java      |   2 +-
 .../ClientMembershipSelectorDUnitTest.java      |   2 +-
 .../ClientRegisterInterestDUnitTest.java        |   2 +-
 ...ClientRegisterInterestSelectorDUnitTest.java |   2 +-
 .../gemfire/cache30/ClientServerTestCase.java   |   6 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |   2 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |   2 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |   2 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |   2 +-
 ...istributedAckRegionCompressionDUnitTest.java |   2 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   2 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |   2 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |   2 +-
 .../DistributedNoAckRegionDUnitTest.java        |   2 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |   2 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   2 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |   2 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   2 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |   2 +-
 .../cache30/LRUEvictionControllerDUnitTest.java |   2 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |   2 +-
 .../MemLRUEvictionControllerDUnitTest.java      |   4 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |   4 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |   2 +-
 .../PartitionedRegionCompressionDUnitTest.java  |   2 +-
 .../cache30/PartitionedRegionDUnitTest.java     |   2 +-
 ...tionedRegionMembershipListenerDUnitTest.java |   2 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |   2 +-
 .../cache30/PreloadedRegionTestCase.java        |   2 +-
 .../gemfire/cache30/ProxyDUnitTest.java         |   2 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |   2 +-
 .../cache30/RegionAttributesTestCase.java       |   2 +-
 .../cache30/RegionExpirationDUnitTest.java      |   2 +-
 .../RegionMembershipListenerDUnitTest.java      |   2 +-
 .../RegionReliabilityDistAckDUnitTest.java      |   2 +-
 .../RegionReliabilityDistNoAckDUnitTest.java    |   2 +-
 .../RegionReliabilityGlobalDUnitTest.java       |   2 +-
 .../RegionReliabilityListenerDUnitTest.java     |   2 +-
 .../cache30/RegionReliabilityTestCase.java      |   2 +-
 .../gemfire/cache30/RegionTestCase.java         |   2 +-
 .../gemfire/cache30/ReliabilityTestCase.java    |   2 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   2 +-
 .../cache30/RolePerformanceDUnitTest.java       |   2 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |   2 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   2 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   2 +-
 .../cache30/TXRestrictionsDUnitTest.java        |   2 +-
 .../gemfire/cache30/TestCacheCallback.java      |   2 +-
 .../gemfire/cache30/TestCacheListener.java      |   8 +-
 .../gemfire/cache30/TestCacheLoader.java        |   2 +-
 .../gemfire/cache30/TestCacheWriter.java        |   2 +-
 .../gemfire/cache30/TestDiskRegion.java         |   2 +-
 .../cache30/TestTransactionListener.java        |   2 +-
 .../AbstractLauncherIntegrationTestCase.java    |   2 +-
 .../AbstractLauncherServiceStatusTest.java      |   2 +-
 .../distributed/AbstractLauncherTest.java       |   2 +-
 ...tractLocatorLauncherIntegrationTestCase.java |   2 +-
 ...stractServerLauncherIntegrationTestCase.java |   2 +-
 .../distributed/DistributedMemberDUnitTest.java |   2 +-
 .../distributed/DistributedSystemDUnitTest.java |   2 +-
 .../distributed/HostedLocatorsDUnitTest.java    |   2 +-
 .../LauncherMemberMXBeanIntegrationTest.java    |   2 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   4 +-
 ...LocatorLauncherLocalFileIntegrationTest.java |   2 +-
 .../LocatorLauncherLocalIntegrationTest.java    |   2 +-
 ...ocatorLauncherRemoteFileIntegrationTest.java |   2 +-
 .../LocatorLauncherRemoteIntegrationTest.java   |   2 +-
 .../distributed/LocatorLauncherTest.java        |   2 +-
 .../ServerLauncherLocalFileIntegrationTest.java |   2 +-
 .../ServerLauncherLocalIntegrationTest.java     |   2 +-
 ...ServerLauncherRemoteFileIntegrationTest.java |   2 +-
 .../ServerLauncherRemoteIntegrationTest.java    |   2 +-
 .../gemfire/distributed/ServerLauncherTest.java |   2 +-
 .../InternalDistributedSystemJUnitTest.java     |   6 +-
 .../internal/ServerLocatorJUnitTest.java        |   2 +-
 .../internal/SharedConfigurationJUnitTest.java  |   2 +-
 .../internal/StartupMessageDataJUnitTest.java   |   2 +-
 .../internal/locks/CollaborationJUnitTest.java  |   2 +-
 .../internal/locks/DLockGrantorHelper.java      |   2 +-
 .../membership/gms/MembershipManagerHelper.java |   2 +-
 .../support/DistributedSystemAdapter.java       |   2 +-
 .../gemfire/internal/ByteArrayData.java         |   2 +-
 .../gemstone/gemfire/internal/ClassBuilder.java |   2 +-
 .../gemfire/internal/ClassPathLoaderTest.java   |   2 +-
 .../internal/DataSerializableJUnitTest.java     |   6 +-
 .../internal/GemFireStatSamplerJUnitTest.java   |   2 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |   2 +-
 .../gemfire/internal/NanoTimerJUnitTest.java    |   2 +-
 .../internal/SimpleStatSamplerJUnitTest.java    |   2 +-
 .../StatArchiveWriterReaderJUnitTest.java       |   2 +-
 .../gemfire/internal/StatSamplerJUnitTest.java  |   2 +-
 .../gemfire/internal/StatSamplerTestCase.java   |   2 +-
 .../internal/UniqueIdGeneratorJUnitTest.java    |   2 +-
 .../internal/cache/AbstractRegionJUnitTest.java |   2 +-
 .../internal/cache/Bug41957DUnitTest.java       |   2 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |   4 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |   2 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   2 +-
 .../gemfire/internal/cache/CommitFunction.java  |   2 +-
 .../cache/DeltaPropagationDUnitTest.java        |   2 +-
 .../cache/DiskRegCacheXmlJUnitTest.java         |   2 +-
 .../cache/DiskRegRecoveryJUnitTest.java         |   2 +-
 .../internal/cache/DiskRegionProperties.java    |   2 +-
 .../internal/cache/DiskRegionTestingBase.java   |   2 +-
 .../cache/DistributedCacheTestCase.java         |   2 +-
 .../internal/cache/EventTrackerDUnitTest.java   |   2 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   2 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |   2 +-
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java |   2 +-
 ...victionAlgoMemoryEnabledRegionJUnitTest.java |   2 +-
 .../cache/NestedTransactionFunction.java        |   2 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |   2 +-
 .../PRDataStoreMemoryOffHeapJUnitTest.java      |   2 +-
 ...dRegionAPIConserveSocketsFalseDUnitTest.java |   2 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |   2 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |   2 +-
 .../internal/cache/RollbackFunction.java        |   2 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |   2 +-
 .../internal/cache/SystemFailureDUnitTest.java  |   2 +-
 .../internal/cache/UpdateVersionJUnitTest.java  |   2 +-
 .../cache/execute/PerformanceTestFunction.java  |   4 +-
 .../SimpleExtensionPointJUnitTest.java          |   2 +-
 .../extension/mock/AbstractMockExtension.java   |   2 +-
 .../mock/AbstractMockExtensionXmlGenerator.java |   2 +-
 .../mock/AlterMockCacheExtensionFunction.java   |   4 +-
 .../mock/AlterMockRegionExtensionFunction.java  |   4 +-
 .../mock/CreateMockCacheExtensionFunction.java  |   4 +-
 .../mock/CreateMockRegionExtensionFunction.java |   4 +-
 .../mock/DestroyMockCacheExtensionFunction.java |   4 +-
 .../DestroyMockRegionExtensionFunction.java     |   4 +-
 .../extension/mock/MockCacheExtension.java      |   2 +-
 .../mock/MockCacheExtensionXmlGenerator.java    |   2 +-
 .../extension/mock/MockExtensionCommands.java   |  16 +--
 .../extension/mock/MockExtensionXmlParser.java  |   2 +-
 .../extension/mock/MockRegionExtension.java     |   2 +-
 .../mock/MockRegionExtensionXmlGenerator.java   |   2 +-
 .../internal/cache/functions/TestFunction.java  |   4 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |   2 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |   2 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |   2 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |   2 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |   2 +-
 .../tier/sockets/ClientConflationDUnitTest.java |   2 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |   2 +-
 .../cache/tier/sockets/DeltaEOFException.java   |   2 +-
 .../DurableClientReconnectAutoDUnitTest.java    |   2 +-
 .../DurableClientReconnectDUnitTest.java        |   2 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |   2 +-
 .../cache/tier/sockets/FaultyDelta.java         |   2 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |   2 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |   8 +-
 .../xmlcache/AbstractEntityResolverTest.java    |  12 +-
 .../xmlcache/AbstractXmlParserJUnitTest.java    |   2 +-
 .../cache/xmlcache/CacheXmlParserJUnitTest.java |  12 +-
 .../xmlcache/CacheXmlVersionJUnitTest.java      |   6 +-
 .../PivotalEntityResolverJUnitTest.java         |   2 +-
 .../cache/xmlcache/RegionCreationJUnitTest.java |   2 +-
 .../xmlcache/XmlGeneratorUtilsJUnitTest.java    |   2 +-
 .../compression/CompressionStatsDUnitTest.java  |   2 +-
 .../io/CompositeOutputStreamJUnitTest.java      |   2 +-
 .../jta/functional/TestXACacheLoader.java       |   2 +-
 .../internal/lang/ClassUtilsJUnitTest.java      |   2 +-
 .../internal/lang/InOutParameterJUnitTest.java  |   2 +-
 .../internal/lang/InitializerJUnitTest.java     |   2 +-
 .../internal/lang/ObjectUtilsJUnitTest.java     |   2 +-
 .../internal/lang/StringUtilsJUnitTest.java     |   2 +-
 .../internal/lang/SystemUtilsJUnitTest.java     |   2 +-
 .../internal/lang/ThreadUtilsJUnitTest.java     |   2 +-
 .../internal/logging/SortLogFileJUnitTest.java  |   2 +-
 .../logging/log4j/ConfigLocatorJUnitTest.java   |   2 +-
 .../internal/net/SocketUtilsJUnitTest.java      |   2 +-
 .../BlockingProcessStreamReaderJUnitTest.java   |   2 +-
 .../LocalProcessControllerJUnitTest.java        |   2 +-
 .../process/LocalProcessLauncherDUnitTest.java  |   2 +-
 .../process/LocalProcessLauncherJUnitTest.java  |   2 +-
 ...NonBlockingProcessStreamReaderJUnitTest.java |   2 +-
 .../internal/process/PidFileJUnitTest.java      |   2 +-
 .../ProcessControllerFactoryJUnitTest.java      |   2 +-
 ...tractSignalNotificationHandlerJUnitTest.java |   2 +-
 .../internal/statistics/DummyStatistics.java    |   2 +-
 .../statistics/SampleCollectorJUnitTest.java    |   2 +-
 .../statistics/StatMonitorHandlerJUnitTest.java |   4 +-
 .../statistics/StatisticsDUnitTest.java         |   8 +-
 .../statistics/StatisticsMonitorJUnitTest.java  |   4 +-
 .../internal/statistics/TestSampleHandler.java  |  10 +-
 .../statistics/TestStatArchiveWriter.java       |   2 +-
 .../statistics/TestStatisticsManager.java       |   2 +-
 .../statistics/TestStatisticsSampler.java       |   2 +-
 .../statistics/ValueMonitorJUnitTest.java       |   2 +-
 .../internal/util/ArrayUtilsJUnitTest.java      |   2 +-
 ...bHelperWithThreadContextClassLoaderTest.java |   2 +-
 .../internal/util/CollectionUtilsJUnitTest.java |   2 +-
 .../gemfire/internal/util/Valuable.java         |   2 +-
 .../DataBrowserJSONValidationJUnitTest.java     |   2 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |   2 +-
 .../stats/DistributedSystemStatsJUnitTest.java  |   2 +-
 .../bean/stats/MBeanStatsTestCase.java          |   2 +-
 .../internal/cli/CommandManagerJUnitTest.java   |   2 +-
 .../AbstractCommandsSupportJUnitTest.java       |   2 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   2 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |   2 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   2 +-
 .../commands/DiskStoreCommandsJUnitTest.java    |   2 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |   2 +-
 .../HTTPServiceSSLSupportJUnitTest.java         |   2 +-
 .../cli/commands/IndexCommandsJUnitTest.java    |   2 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |   2 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |   2 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |   2 +-
 .../cli/commands/UserCommandsDUnitTest.java     |   2 +-
 .../DescribeDiskStoreFunctionJUnitTest.java     |   2 +-
 .../ListDiskStoresFunctionJUnitTest.java        |   2 +-
 .../functions/ListIndexFunctionJUnitTest.java   |   2 +-
 .../domain/CacheElementJUnitTest.java           |   8 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |  20 ++--
 .../configuration/utils/XmlUtilsJUnitTest.java  |   2 +-
 .../security/ClientAuthenticationDUnitTest.java |   2 +-
 .../security/ClientAuthorizationDUnitTest.java  |   2 +-
 .../security/ClientAuthorizationTestCase.java   |  12 +-
 .../DeltaClientAuthorizationDUnitTest.java      |   2 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |   2 +-
 .../security/P2PAuthenticationDUnitTest.java    |   2 +-
 .../gemfire/security/SecurityTestUtils.java     |   2 +-
 .../generator/AuthzCredentialGenerator.java     |   4 +-
 .../security/generator/CredentialGenerator.java |   4 +-
 .../UserPasswordWithExtraPropsAuthInit.java     |   2 +-
 .../security/templates/DummyAuthenticator.java  |   2 +-
 .../security/templates/DummyAuthorization.java  |   2 +-
 .../templates/FunctionSecurityPrmsHolder.java   |   2 +-
 .../templates/LdapUserAuthenticator.java        |   2 +-
 .../security/templates/PKCSAuthInit.java        |   2 +-
 .../templates/UserPasswordAuthInit.java         |   2 +-
 .../security/templates/UsernamePrincipal.java   |   2 +-
 .../security/templates/XmlAuthorization.java    |   2 +-
 .../security/templates/XmlErrorHandler.java     |   2 +-
 .../gemfire/test/dunit/IgnoredException.java    |   6 +-
 .../gemfire/test/dunit/ThreadUtils.java         |   8 +-
 .../cache/internal/JUnit3CacheTestCase.java     |   2 +-
 .../cache/internal/JUnit4CacheTestCase.java     |   2 +-
 .../internal/JUnit3DistributedTestCase.java     |   8 +-
 .../internal/JUnit4DistributedTestCase.java     |   8 +-
 .../gemfire/test/golden/GoldenComparator.java   |   2 +-
 .../gemfire/test/golden/GoldenTestCase.java     |   2 +-
 .../gemfire/test/process/ProcessWrapper.java    |   2 +-
 .../java/parReg/query/unittest/Position.java    |   2 +-
 .../cache/client/internal/CloseCQOp.java        |   2 +-
 .../cache/client/internal/CreateCQOp.java       |   2 +-
 .../cache/client/internal/CreateCQWithIROp.java |   2 +-
 .../cache/client/internal/GetDurableCQsOp.java  |   2 +-
 .../client/internal/ServerCQProxyImpl.java      |   2 +-
 .../gemfire/cache/client/internal/StopCQOp.java |   2 +-
 .../internal/cq/CqAttributesMutatorImpl.java    |   2 +-
 .../cache/query/internal/cq/CqEventImpl.java    |   2 +-
 .../cache/query/internal/cq/CqListenerImpl.java |   2 +-
 .../cache/query/internal/cq/CqQueryImpl.java    |   2 +-
 .../cache/query/internal/cq/CqServiceImpl.java  |   2 +-
 .../internal/cq/CqServiceStatisticsImpl.java    |   2 +-
 .../query/internal/cq/CqServiceVsdStats.java    |   2 +-
 .../query/internal/cq/CqStatisticsImpl.java     |   2 +-
 .../cache/tier/sockets/command/ExecuteCQ61.java |   2 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |   6 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |   6 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |   4 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  |   4 +-
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |   2 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |   2 +-
 .../internal/cache/PutAllCSDUnitTest.java       |   2 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |   2 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |   2 +-
 .../sockets/DurableClientCrashDUnitTest.java    |   2 +-
 .../sockets/DurableClientNetDownDUnitTest.java  |   2 +-
 .../tier/sockets/DurableClientTestCase.java     |   2 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |   2 +-
 .../ClientAuthorizationTwoDUnitTest.java        |   2 +-
 .../security/ClientAuthzObjectModDUnitTest.java |   2 +-
 .../ClientPostAuthorizationDUnitTest.java       |   2 +-
 .../lucene/internal/LuceneServiceImpl.java      |   2 +-
 .../tools/pulse/internal/PulseAppListener.java  |   2 +-
 .../internal/controllers/PulseController.java   |   2 +-
 .../tools/pulse/internal/data/Cluster.java      |   2 +-
 .../tools/pulse/internal/data/DataBrowser.java  |   2 +-
 .../pulse/internal/data/IClusterUpdater.java    |   2 +-
 .../pulse/internal/data/JMXDataUpdater.java     |   2 +-
 .../pulse/internal/data/JmxManagerFinder.java   |   2 +-
 .../tools/pulse/internal/data/PulseConfig.java  |   2 +-
 .../tools/pulse/internal/data/PulseVersion.java |   2 +-
 .../tools/pulse/internal/data/Repository.java   |   2 +-
 .../tools/pulse/internal/log/LogWriter.java     |   2 +-
 .../pulse/internal/log/MessageFormatter.java    |   2 +-
 .../pulse/internal/log/PulseLogWriter.java      |   2 +-
 .../tools/pulse/internal/log/PulseLogger.java   |   4 +-
 .../security/GemFireAuthentication.java         |   2 +-
 .../security/GemFireAuthenticationProvider.java |   2 +-
 .../internal/service/ClusterDetailsService.java |   2 +-
 .../service/ClusterDiskThroughputService.java   |   2 +-
 .../service/ClusterGCPausesService.java         |   2 +-
 .../service/ClusterKeyStatisticsService.java    |   2 +-
 .../internal/service/ClusterMemberService.java  |   2 +-
 .../service/ClusterMembersRGraphService.java    |   2 +-
 .../service/ClusterMemoryUsageService.java      |   2 +-
 .../internal/service/ClusterRegionService.java  |   2 +-
 .../internal/service/ClusterRegionsService.java |   2 +-
 .../service/ClusterSelectedRegionService.java   |   2 +-
 .../ClusterSelectedRegionsMemberService.java    |   2 +-
 .../internal/service/ClusterWANInfoService.java |   2 +-
 .../service/MemberAsynchEventQueuesService.java |   2 +-
 .../internal/service/MemberClientsService.java  |   2 +-
 .../internal/service/MemberDetailsService.java  |   2 +-
 .../service/MemberDiskThroughputService.java    |   2 +-
 .../internal/service/MemberGCPausesService.java |   2 +-
 .../service/MemberGatewayHubService.java        |   2 +-
 .../service/MemberHeapUsageService.java         |   2 +-
 .../service/MemberKeyStatisticsService.java     |   2 +-
 .../internal/service/MemberRegionsService.java  |   2 +-
 .../internal/service/MembersListService.java    |   2 +-
 .../pulse/internal/service/PulseService.java    |   2 +-
 .../internal/service/PulseServiceFactory.java   |   2 +-
 .../internal/service/PulseVersionService.java   |   2 +-
 .../service/QueryStatisticsService.java         |   2 +-
 .../internal/service/SystemAlertsService.java   |   2 +-
 .../pulse/internal/util/IPAddressUtil.java      |   2 +-
 .../tools/pulse/internal/util/StringUtils.java  |   2 +-
 .../tools/pulse/internal/util/TimeUtils.java    |   2 +-
 .../webapp/scripts/pulsescript/regionView.js    |   2 +-
 .../tools/pulse/tests/PulseAutomatedTest.java   |   2 +-
 .../cache/client/internal/SenderProxy.java      |   2 +-
 .../internal/locator/wan/LocatorDiscovery.java  |   2 +-
 .../locator/wan/RemoteLocatorJoinRequest.java   |   2 +-
 .../cache/wan/GatewayReceiverFactoryImpl.java   |   2 +-
 .../internal/cache/wan/GatewayReceiverImpl.java |   2 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |   2 +-
 .../cache/wan/GatewaySenderFactoryImpl.java     |   2 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java |   2 +-
 .../wan/serial/SerialGatewaySenderImpl.java     |   2 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |   2 +-
 .../ClusterConfigurationDUnitTest.java          |   4 +-
 .../web/controllers/AbstractBaseController.java |   2 +-
 .../web/controllers/BaseControllerAdvice.java   |   2 +-
 .../web/controllers/CommonCrudController.java   |   2 +-
 .../controllers/FunctionAccessController.java   |   2 +-
 .../web/controllers/PdxBasedCrudController.java |   2 +-
 .../web/controllers/QueryAccessController.java  |   2 +-
 .../controllers/support/QueryResultTypes.java   |   2 +-
 .../web/controllers/support/RegionData.java     |   2 +-
 .../controllers/support/RegionEntryData.java    |   2 +-
 .../DataTypeNotSupportedException.java          |   2 +-
 .../web/exception/GemfireRestException.java     |   2 +-
 .../web/exception/MalformedJsonException.java   |   2 +-
 .../web/exception/RegionNotFoundException.java  |   2 +-
 .../exception/ResourceNotFoundException.java    |   2 +-
 ...stomMappingJackson2HttpMessageConverter.java |   2 +-
 .../rest/internal/web/util/ArrayUtils.java      |   2 +-
 .../rest/internal/web/util/DateTimeUtils.java   |   2 +-
 .../internal/web/util/IdentifiableUtils.java    |   2 +-
 .../rest/internal/web/util/JSONUtils.java       |   2 +-
 .../rest/internal/web/util/JsonWriter.java      |   2 +-
 .../rest/internal/web/util/NumberUtils.java     |   2 +-
 .../rest/internal/web/util/ValidationUtils.java |   2 +-
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  |   2 +-
 .../internal/web/AbstractWebTestCase.java       |   2 +-
 .../ShellCommandsControllerJUnitTest.java       |   2 +-
 .../LoginHandlerInterceptorJUnitTest.java       |   2 +-
 .../internal/web/domain/LinkIndexJUnitTest.java |   2 +-
 .../internal/web/domain/LinkJUnitTest.java      |   2 +-
 .../domain/QueryParameterSourceJUnitTest.java   |   2 +-
 .../web/http/ClientHttpRequestJUnitTest.java    |   2 +-
 ...ableObjectHttpMessageConverterJUnitTest.java |   2 +-
 .../RestHttpOperationInvokerJUnitTest.java      |   2 +-
 .../SimpleHttpOperationInvokerJUnitTest.java    |   2 +-
 .../web/util/ConvertUtilsJUnitTest.java         |   2 +-
 .../internal/web/util/UriUtilsJUnitTest.java    |   2 +-
 2022 files changed, 3917 insertions(+), 3915 deletions(-)
----------------------------------------------------------------------



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinLRURegionEntry.java
index 9b43c4f..19c6425 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinLRURegionEntry.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.cache;
  * Thin -> no extra statistics
  * LRU -> entries maintain LRU information
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinRegionEntry.java
index b966246..c212163 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinRegionEntry.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.cache;
  * VM -> entries stored in VM memory
  * Thin -> no extra statistics
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
index 54133cc..32abd68 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ValidatingDiskRegion.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * A disk region that is created when doing offline validation.
- * @since prPersistSprint3
+ * @since GemFire prPersistSprint3
  */
 public class ValidatingDiskRegion extends DiskRegion implements DiskRecoveryStore {
   protected ValidatingDiskRegion(DiskStoreImpl ds,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
index abf7952..369046f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java
@@ -139,7 +139,7 @@ public class VersionedStatsDiskLRURegionEntryHeapIntKey extends VersionedStatsDi
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
index 0ac3770..4f0a21a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java
@@ -139,7 +139,7 @@ public class VersionedStatsDiskLRURegionEntryHeapLongKey extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
index 2319de0..9adc75c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java
@@ -139,7 +139,7 @@ public class VersionedStatsDiskLRURegionEntryHeapObjectKey extends VersionedStat
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
index 31608ab..57a49da 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java
@@ -156,7 +156,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey1 extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
index c8c65b6..c278422 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java
@@ -168,7 +168,7 @@ public class VersionedStatsDiskLRURegionEntryHeapStringKey2 extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
index 04237e5..8c98440 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -141,7 +141,7 @@ public class VersionedStatsDiskLRURegionEntryHeapUUIDKey extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
index 6e419a6..ae2acca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -188,7 +188,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapIntKey extends VersionedStat
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
index 1fec4c8..859980d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -188,7 +188,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapLongKey extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
index e9513f3..7c2e6f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -188,7 +188,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapObjectKey extends VersionedS
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
index ee365cd..fe69989 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -205,7 +205,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey1 extends Versioned
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
index 7db6137..6e8651c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -217,7 +217,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapStringKey2 extends Versioned
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 2ee17f8..cffd1ef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -190,7 +190,7 @@ public class VersionedStatsDiskLRURegionEntryOffHeapUUIDKey extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
index 44956af..5d087b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java
@@ -122,7 +122,7 @@ public class VersionedStatsDiskRegionEntryHeapIntKey extends VersionedStatsDiskR
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
index 4693680..d723de6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java
@@ -122,7 +122,7 @@ public class VersionedStatsDiskRegionEntryHeapLongKey extends VersionedStatsDisk
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
index 9548cf9..61403ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java
@@ -122,7 +122,7 @@ public class VersionedStatsDiskRegionEntryHeapObjectKey extends VersionedStatsDi
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
index 53b5d57..ebfb3de 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java
@@ -139,7 +139,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey1 extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
index b1e47ad..a984ed6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java
@@ -151,7 +151,7 @@ public class VersionedStatsDiskRegionEntryHeapStringKey2 extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
index 6b17ead..1f63b43 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java
@@ -124,7 +124,7 @@ public class VersionedStatsDiskRegionEntryHeapUUIDKey extends VersionedStatsDisk
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
index 25852e0..8d12972 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java
@@ -171,7 +171,7 @@ public class VersionedStatsDiskRegionEntryOffHeapIntKey extends VersionedStatsDi
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
index 4697f1c..b4f14b0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java
@@ -171,7 +171,7 @@ public class VersionedStatsDiskRegionEntryOffHeapLongKey extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
index 4716657..cb0aa66 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java
@@ -171,7 +171,7 @@ public class VersionedStatsDiskRegionEntryOffHeapObjectKey extends VersionedStat
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
index fe533d7..9fc7b6a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java
@@ -188,7 +188,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey1 extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
index 08d4b25..0252a39 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java
@@ -200,7 +200,7 @@ public class VersionedStatsDiskRegionEntryOffHeapStringKey2 extends VersionedSta
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
index 3767e9f..3e015a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -173,7 +173,7 @@ public class VersionedStatsDiskRegionEntryOffHeapUUIDKey extends VersionedStatsD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
index c8dc072..af35a81 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapIntKey.java
@@ -138,7 +138,7 @@ public class VersionedThinDiskLRURegionEntryHeapIntKey extends VersionedThinDisk
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
index 5d89169..749d1dc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapLongKey.java
@@ -138,7 +138,7 @@ public class VersionedThinDiskLRURegionEntryHeapLongKey extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
index 9aed9d2..2edcdec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapObjectKey.java
@@ -138,7 +138,7 @@ public class VersionedThinDiskLRURegionEntryHeapObjectKey extends VersionedThinD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
index b993eb6..3a23fcb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey1.java
@@ -155,7 +155,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey1 extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
index 4b07a6d..53c9276 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapStringKey2.java
@@ -167,7 +167,7 @@ public class VersionedThinDiskLRURegionEntryHeapStringKey2 extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
index 96561e1..a8a2242 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryHeapUUIDKey.java
@@ -140,7 +140,7 @@ public class VersionedThinDiskLRURegionEntryHeapUUIDKey extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
index 63e1d36..0e1ca51 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapIntKey.java
@@ -187,7 +187,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapIntKey extends VersionedThinD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
index 482b432..ca2565d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapLongKey.java
@@ -187,7 +187,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapLongKey extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
index e3f3d20..e808dac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -187,7 +187,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapObjectKey extends VersionedTh
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
index 9f3ac76..6761aa0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -204,7 +204,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey1 extends VersionedT
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
index 874aaff..4948373 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -216,7 +216,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapStringKey2 extends VersionedT
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
index c3fd45a..98db26c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -189,7 +189,7 @@ public class VersionedThinDiskLRURegionEntryOffHeapUUIDKey extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
index b6d75b7..5a00707 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapIntKey.java
@@ -120,7 +120,7 @@ public class VersionedThinDiskRegionEntryHeapIntKey extends VersionedThinDiskReg
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
index acdd7ff..0c3d112 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapLongKey.java
@@ -120,7 +120,7 @@ public class VersionedThinDiskRegionEntryHeapLongKey extends VersionedThinDiskRe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
index e8a4148..82796d8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapObjectKey.java
@@ -120,7 +120,7 @@ public class VersionedThinDiskRegionEntryHeapObjectKey extends VersionedThinDisk
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
index d2d074f..ced02db 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey1.java
@@ -137,7 +137,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey1 extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
index 79eb0f0..75090a1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapStringKey2.java
@@ -149,7 +149,7 @@ public class VersionedThinDiskRegionEntryHeapStringKey2 extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
index db8a8c0..0423cfa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryHeapUUIDKey.java
@@ -122,7 +122,7 @@ public class VersionedThinDiskRegionEntryHeapUUIDKey extends VersionedThinDiskRe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
index b2cc3e3..6771cfa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapIntKey.java
@@ -169,7 +169,7 @@ public class VersionedThinDiskRegionEntryOffHeapIntKey extends VersionedThinDisk
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
index fd87e57..3a60770 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapLongKey.java
@@ -169,7 +169,7 @@ public class VersionedThinDiskRegionEntryOffHeapLongKey extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
index 425840e..46dac77 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapObjectKey.java
@@ -169,7 +169,7 @@ public class VersionedThinDiskRegionEntryOffHeapObjectKey extends VersionedThinD
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
index b61434e..af1ca29 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey1.java
@@ -186,7 +186,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey1 extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
index 77f2386..3b582bf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapStringKey2.java
@@ -198,7 +198,7 @@ public class VersionedThinDiskRegionEntryOffHeapStringKey2 extends VersionedThin
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
index 7387d7a..00b3014 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VersionedThinDiskRegionEntryOffHeapUUIDKey.java
@@ -171,7 +171,7 @@ public class VersionedThinDiskRegionEntryOffHeapUUIDKey extends VersionedThinDis
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
index 99a5ceb..7d5b255 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/WrappedCallbackArgument.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.Assert;
  * It is for internal purposes only.
  *
  *
- * @since 5.7 
+ * @since GemFire 5.7
  */
 public abstract class WrappedCallbackArgument {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
index 69838dc..3de03e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/HeapMemoryMonitor.java
@@ -61,7 +61,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * the MemoryMXBean, by polling the JVM and as a listener on GemFire Statistics
  * output in order to accommodate differences in the various JVMs.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class HeapMemoryMonitor implements NotificationListener, ResourceMonitor {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/MemoryThresholds.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/MemoryThresholds.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/MemoryThresholds.java
index a95fd8e..75ce637 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/MemoryThresholds.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/MemoryThresholds.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Stores eviction and critical thresholds for memory as well as the logic for
  * determining how memory transitions between states.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class MemoryThresholds {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/OffHeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/OffHeapMemoryMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/OffHeapMemoryMonitor.java
index d5242dc..855d904 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/OffHeapMemoryMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/OffHeapMemoryMonitor.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.offheap.MemoryUsageListener;
  * are compared against current off-heap usage and, with the help of {#link
  * InternalResourceManager}, dispatches events when the thresholds are crossed.
  *
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapMemoryMonitor implements ResourceMonitor, MemoryUsageListener {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
index b163383..415fa3c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceAdvisor.java
@@ -53,7 +53,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * The advisor associated with a {@link ResourceManager}.  Allows knowledge of
  * remote {@link ResourceManager} state and distribution of local {@link ResourceManager} state.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class ResourceAdvisor extends DistributionAdvisor {
   private static final Logger logger = LogService.getLogger();
@@ -294,7 +294,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
    * Profile which shares state with other ResourceManagers.
    * The data available in this profile should be enough to 
    * deliver a {@link MemoryEvent} for any of the CRITICAL {@link MemoryState}s 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static class ResourceManagerProfile extends Profile {
     //Resource manager related fields
@@ -345,7 +345,7 @@ public class ResourceAdvisor extends DistributionAdvisor {
      * Used to process incoming Resource Manager profiles. A reply is expected
      * to contain a profile with state of the local Resource Manager.
      * 
-     * @since 6.0
+     * @since GemFire 6.0
      */
     @Override
     public void processIncoming(DistributionManager dm, String adviseePath,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
index aa8845c..79725b7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceListener.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.cache.control;
  * Provides notification of {@link com.gemstone.gemfire.cache.Cache}
  * resource management events.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface ResourceListener<T extends ResourceEvent> {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceMonitor.java
index 449fdc9..27b725d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/control/ResourceMonitor.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.control.ResourceAdvisor.ResourceManag
  * Implemented by classes that the ResourceManager creates in order to monitor a
  * specific type of resource (heap memory, off-heap memory, disk, etc.).
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 interface ResourceMonitor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
index aeabbd8..27d02c4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/delta/Delta.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.EntryEvent;
  * Internal Note: When an update message carries a Delta as a payload,
  * it makes sure it gets deserialized before being put into the region.
  *
- * @since 5.5
+ * @since GemFire 5.5
  * @see com.gemstone.gemfire.internal.cache.UpdateOperation
  */
 public interface Delta {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
index ff736be..7b7c34d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/AbstractExecution.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Abstract implementation of InternalExecution interface.
  *  
- * @since 5.8LA
+ * @since GemFire 5.8LA
  *
  */
 public abstract class AbstractExecution implements InternalExecution {
@@ -496,7 +496,7 @@ public abstract class AbstractExecution implements InternalExecution {
    * @return byte[]
    * @throws FunctionException
    *                 if functionID passed is null
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public byte[] getFunctionAttributes(String functionId) {
     if (functionId == null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/BucketMovedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/BucketMovedException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/BucketMovedException.java
index f2eb7ab..aa489f1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/BucketMovedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/BucketMovedException.java
@@ -25,7 +25,7 @@ public class BucketMovedException extends GemFireException {
      * Creates new function exception with given error message.
      * 
      * @param msg
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public BucketMovedException(String msg) {
       super(msg);
@@ -37,7 +37,7 @@ public class BucketMovedException extends GemFireException {
      * 
      * @param msg
      * @param cause
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public BucketMovedException(String msg, Throwable cause) {
       super(msg, cause);
@@ -48,7 +48,7 @@ public class BucketMovedException extends GemFireException {
      * error message.
      * 
      * @param cause
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public BucketMovedException(Throwable cause) {
       super(cause);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DefaultResultCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DefaultResultCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DefaultResultCollector.java
index 8f36b1f..470a540 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DefaultResultCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DefaultResultCollector.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * implementation stores the result in a List. The size of the list will be same
  * as the no of nodes on which a function got executed
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class DefaultResultCollector implements ResultCollector {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutor.java
index adb07f9..0053bf8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutor.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * locally.
  * 
  * 
- * @since 5.8 LA
+ * @since GemFire 5.8 LA
  * 
  */
 public class DistributedRegionFunctionExecutor extends AbstractExecution {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionContextImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionContextImpl.java
index c0dfb6d..9b5ce0f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionContextImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/FunctionContextImpl.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.execute.ResultSender;
  * For data dependent functions refer to {@link RegionFunctionContext}
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see RegionFunctionContextImpl
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
index d3fd2f2..5ffd72d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalExecution.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.execute.ResultCollector;
 /**
  * Internal interface for SQLFabric. It has internal methods specific for SQLFabric
  * 
- * @since 5.8LA
+ * @since GemFire 5.8LA
  * 
  */
 public interface InternalExecution extends Execution {
@@ -73,7 +73,7 @@ public interface InternalExecution extends Execution {
    * @throws UnsupportedOperationException
    *           if not called after
    *           {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)}
-   * @since 9.0
+   * @since Geode 1.0
    */
   public InternalExecution withBucketFilter(Set<Integer> bucketIDs);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionException.java
index 9fe6c24..80e467c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionException.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
  * </p>
  * 
  * 
- * @since 6.6
+ * @since GemFire 6.6
  * @see FunctionService
  */
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
index 8af841d..54e03c7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/InternalFunctionService.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Provides internal methods for sqlFabric product
  * 
  * 
- * @since 6.1
+ * @since GemFire 6.1
  * 
  */
 public class InternalFunctionService {
@@ -93,7 +93,7 @@ public class InternalFunctionService {
   /**
    * @param region
    * @return true if the method is called on a region has a {@link Pool}.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private static boolean isClientRegion(Region region) {
     LocalRegion localRegion = (LocalRegion)region;
@@ -120,7 +120,7 @@ public class InternalFunctionService {
    *          <code>groups</code></a>) on which to execute the function.
    *          Function will be executed on all servers of each group
    * @return Execution
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onServers(RegionService regionService, String... groups) {
     return funcServiceManager.onServers(regionService, groups);
@@ -144,7 +144,7 @@ public class InternalFunctionService {
    *          <code>groups</code></a>) on which to execute the function.
    *          Function will be executed on one server of each group
    * @return Execution
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onServer(RegionService regionService, String... groups) {
     return funcServiceManager.onServer(regionService, groups);
@@ -167,7 +167,7 @@ public class InternalFunctionService {
    *          <code>groups</code></a>) on which to execute the function.
    *          Function will be executed on all servers of each group
    * @return Execution
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onServers(Pool pool, String... groups) {
     return funcServiceManager.onServers(pool, groups);
@@ -190,7 +190,7 @@ public class InternalFunctionService {
    *          <code>groups</code></a>) on which to execute the function.
    *          Function will be executed on one server of each group
    * @return Execution
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onServer(Pool pool, String... groups) {
     return funcServiceManager.onServer(pool, groups);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberMappedArgument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberMappedArgument.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberMappedArgument.java
index d328d03..001b701 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberMappedArgument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MemberMappedArgument.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * map, it will include the query string as an argument. When it is sent to a
  * member that is in the map, will not include the query string as an argument.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class MemberMappedArgument implements Serializable{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContext.java
index 54eaea1..43dc087 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContext.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
  * {@link InternalFunctionService#onRegions(Set)}
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public interface MultiRegionFunctionContext extends FunctionContext {
@@ -41,7 +41,7 @@ public interface MultiRegionFunctionContext extends FunctionContext {
    * @return a boolean (true) to identify whether it is a re-execute (else
    *         false)
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @see Function#isHA()
    */
   public boolean isPossibleDuplicate();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContextImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContextImpl.java
index 5a4e2b9..dec81a8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContextImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/MultiRegionFunctionContextImpl.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.execute.ResultSender;
  * {@link InternalFunctionService#onRegions(Set)}
  * 
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public class MultiRegionFunctionContextImpl extends FunctionContextImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/NoResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/NoResult.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/NoResult.java
index 068ec4b..484b21d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/NoResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/NoResult.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * 
  * 
  * 
- * @since 5.8 Beta
+ * @since GemFire 5.8 Beta
  * 
  * @see Function#hasResult()
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
index 175e863..15d39c9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/RegionFunctionContextImpl.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
  * and filter passed to the function execution
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see FunctionContextImpl
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerRegionFunctionExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerRegionFunctionExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerRegionFunctionExecutor.java
index ebda491..3a445e7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerRegionFunctionExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerRegionFunctionExecutor.java
@@ -42,7 +42,7 @@ import org.apache.logging.log4j.Logger;
  * Executes Function with FunctionService#onRegion(Region region) in client server mode. 
  * 
  * @see FunctionService#onRegion(Region) * 
- * @since 5.8 LA
+ * @since GemFire 5.8 LA
  *
  */
 public class ServerRegionFunctionExecutor extends AbstractExecution {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender65.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender65.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender65.java
index 1a1b6c7..4f248ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender65.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/ServerToClientFunctionResultSender65.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 /**
  * 
- * @since 6.5
+ * @since GemFire 6.5
  *
  */
 public class ServerToClientFunctionResultSender65 extends

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/FindRestEnabledServersFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/FindRestEnabledServersFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/FindRestEnabledServersFunction.java
index 050c0e9..0836331 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/FindRestEnabledServersFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/execute/util/FindRestEnabledServersFunction.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 /**
 * The FindRestEnabledServersFunction class is a gemfire function that gives details about REST enabled gemfire servers.
 * <p/>
-* @since 8.1
+* @since GemFire 8.1
 */
 
 public class FindRestEnabledServersFunction extends FunctionAdapter implements InternalEntity  { 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extensible.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extensible.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extensible.java
index 87c2c6b..a3796d4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extensible.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extensible.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
  * Used in {@link CacheXml} to read and write cache xml configurations.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public interface Extensible<T> {
 
@@ -35,7 +35,7 @@ public interface Extensible<T> {
    * Get {@link ExtensionPoint} for this object.
    * 
    * @return {@link ExtensionPoint} for this object.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public ExtensionPoint<T> getExtensionPoint();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extension.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extension.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extension.java
index bccfc79..ced104b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extension.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/Extension.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.XmlGenerator;
  * Interface used for objects wishing to extend and {@link Extensible} object.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public interface Extension<T> {
 
@@ -34,7 +34,7 @@ public interface Extension<T> {
    * configuration.
    * 
    * @return {@link XmlGenerator} for this object's configuration.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   XmlGenerator<T> getXmlGenerator();
 
@@ -58,7 +58,7 @@ public interface Extension<T> {
    *          source object this extension is currently attached to.
    * @param target
    *          target object to attach any created extensions to.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   void onCreate(Extensible<T> source, Extensible<T> target);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
index 9fe30b4..0ecf39a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/ExtensionPoint.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.cache.extension;
  * Allows {@link Extensible} objects to add and remove {@link Extension}s.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public interface ExtensionPoint<T> {
 
@@ -30,7 +30,7 @@ public interface ExtensionPoint<T> {
    * 
    * @param extension
    *          to add.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   void addExtension(Extension<T> extension);
 
@@ -39,7 +39,7 @@ public interface ExtensionPoint<T> {
    * 
    * @param extension
    *          to remove.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   void removeExtension(Extension<T> extension);
 
@@ -47,7 +47,7 @@ public interface ExtensionPoint<T> {
    * Get {@link Iterable} of {@link Extension}s.
    * 
    * @return {@link Exception}s
-   * @since 8.1
+   * @since GemFire 8.1
    */
   Iterable<Extension<T>> getExtensions();
 
@@ -57,7 +57,7 @@ public interface ExtensionPoint<T> {
    * 
    * @return {@link Extensible} object target.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   T getTarget();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
index 7ae6a63..2d88808 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/extension/SimpleExtensionPoint.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.util.CollectionUtils;
  * existing objects.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 // UnitTest SimpleExtensionPointJUnitTest
 public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
@@ -50,7 +50,7 @@ public class SimpleExtensionPoint<T> implements ExtensionPoint<T> {
    * @param target
    *          the <code>T</code> instance being extended. Likely the same as
    *          <code>exensible</code>.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public SimpleExtensionPoint(final Extensible<T> extensible, final T target) {
     this.extensible = extensible;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerMap.java
index 8cc0310..084140f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerMap.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class HAContainerMap implements HAContainerWrapper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerRegion.java
index fe0c112..eeefaee 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerRegion.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl;
 import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class HAContainerRegion implements HAContainerWrapper {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerWrapper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerWrapper.java
index 5745118..b0f3e45 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerWrapper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HAContainerWrapper.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 
 /**
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface HAContainerWrapper extends Map {
 


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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
index 36c4dfe..7db1deb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
@@ -54,7 +54,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 /***
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class MemberCommands implements CommandMarker {
   private Gfsh getGfsh() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
index fffa077..020b134 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
@@ -122,7 +122,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class MiscellaneousCommands implements CommandMarker {
   public static final String NETSTAT_FILE_REQUIRED_EXTENSION = ".txt";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java
index b9c853d..d84959f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommands.java
@@ -55,7 +55,7 @@ import static com.gemstone.gemfire.cache.operations.OperationContext.Resource;
  * The QueueCommands class encapsulates all GemFire Queue commands in Gfsh.
  * </p>
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class QueueCommands implements CommandMarker {
   private Gfsh getGfsh() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
index 0408675..93d55f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
@@ -65,7 +65,7 @@ import org.springframework.shell.core.annotation.CliOption;
  * <li>describe region
  * </ul>
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionCommands implements CommandMarker {
   private Gfsh getGfsh() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 10789e8..7fda9f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -86,7 +86,8 @@ import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
 /**
- * @since 7.0
+ *
+ * @since GemFire 7.0
  */
 public class ShellCommands implements CommandMarker {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/BooleanConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/BooleanConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/BooleanConverter.java
index aab0233..fbd90fa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/BooleanConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/BooleanConverter.java
@@ -27,7 +27,7 @@ import org.springframework.shell.core.MethodTarget;
  * SHL's BooleanConverter. Removed completion & conversion for values like 0, 1,
  * yes, no.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class BooleanConverter implements Converter<Boolean> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/ClusterMemberIdNameConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/ClusterMemberIdNameConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/ClusterMemberIdNameConverter.java
index d0062d1..808e4a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/ClusterMemberIdNameConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/ClusterMemberIdNameConverter.java
@@ -31,7 +31,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  *
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class ClusterMemberIdNameConverter implements Converter<String> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirConverter.java
index 6e538d7..d37ddca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirConverter.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  * 
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirPathConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirPathConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirPathConverter.java
index 5d5dfb3..d6061cd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirPathConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DirPathConverter.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.cli.ConverterHint;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DirPathConverter implements Converter<String> {
   private final DirFilterImpl dirFilter = new DirFilterImpl();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DiskStoreNameConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DiskStoreNameConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DiskStoreNameConverter.java
index 66d254b..eaec3f3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DiskStoreNameConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/DiskStoreNameConverter.java
@@ -34,7 +34,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DiskStoreNameConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/EnumConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/EnumConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/EnumConverter.java
index 8e30e82..6492d36 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/EnumConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/EnumConverter.java
@@ -25,7 +25,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  * {@link Converter} for {@link Enum}.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 /*
  * Use this EnumConverter instead of SHL's EnumConverter. Added null check for

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathConverter.java
index 09289dc..8b56018 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathConverter.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.cli.ConverterHint;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FilePathConverter implements Converter<File> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathStringConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathStringConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathStringConverter.java
index 3e2875b..6b0f98b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathStringConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/FilePathStringConverter.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.cli.ConverterHint;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FilePathStringConverter implements Converter<String> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/GatewaySenderIdConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/GatewaySenderIdConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/GatewaySenderIdConverter.java
index 147520d..ef979d7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/GatewaySenderIdConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/GatewaySenderIdConverter.java
@@ -32,7 +32,7 @@ import org.springframework.shell.core.MethodTarget;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GatewaySenderIdConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HelpConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HelpConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HelpConverter.java
index 5cd0bb6..9897b31 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HelpConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HelpConverter.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
  * {@link Converter} for {@link GfshHelpCommands#obtainHelp(String)}
  * 
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class HelpConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HintTopicConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HintTopicConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HintTopicConverter.java
index faccd43..edea393 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HintTopicConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/HintTopicConverter.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.CommandManager;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class HintTopicConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
index 8f7cf8d..13f6a22 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorDiscoveryConfigConverter.java
@@ -31,7 +31,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  *
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class LocatorDiscoveryConfigConverter implements Converter<String> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorIdNameConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorIdNameConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorIdNameConverter.java
index 873061b..e598aa0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorIdNameConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LocatorIdNameConverter.java
@@ -31,7 +31,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  *
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class LocatorIdNameConverter implements Converter<String> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LogLevelConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LogLevelConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LogLevelConverter.java
index c00c266..2470c0b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LogLevelConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/LogLevelConverter.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.cli.ConverterHint;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LogLevelConverter implements Converter<String> {
   private Set<Completion> logLevels;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberGroupConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberGroupConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberGroupConverter.java
index cdab7ed..97c12a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberGroupConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberGroupConverter.java
@@ -30,7 +30,7 @@ import org.springframework.shell.core.MethodTarget;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class MemberGroupConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberIdNameConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberIdNameConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberIdNameConverter.java
index 088c7fb..f72ffa8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberIdNameConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/MemberIdNameConverter.java
@@ -31,7 +31,7 @@ import org.springframework.shell.core.MethodTarget;
 /**
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class MemberIdNameConverter implements Converter<String> {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverter.java
index 27893bc..ba6eeaa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/RegionPathConverter.java
@@ -30,7 +30,7 @@ import org.springframework.shell.core.MethodTarget;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionPathConverter implements Converter<String> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringArrayConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringArrayConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringArrayConverter.java
index 8e1e5a4..87a9869 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringArrayConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringArrayConverter.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.management.internal.cli.MultipleValueAdapter;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  * 
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringListConverter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringListConverter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringListConverter.java
index 15df1b8..abce72a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringListConverter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/converters/StringListConverter.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.MultipleValueAdapter;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class StringListConverter extends MultipleValueAdapter<List<String>> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/AsyncEventQueueDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/AsyncEventQueueDetails.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/AsyncEventQueueDetails.java
index 1e38768..596d710 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/AsyncEventQueueDetails.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/AsyncEventQueueDetails.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management.internal.cli.domain;
  * Used to transfer information about an AsyncEventQueue from a function
  * being executed on a server back to the manager that invoked the function.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 import java.io.Serializable;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/ConnectToLocatorResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/ConnectToLocatorResult.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/ConnectToLocatorResult.java
index cd32785..1887e39 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/ConnectToLocatorResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/ConnectToLocatorResult.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.management.internal.cli.util.ConnectionEndpoint;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ConnectToLocatorResult {
   private ConnectionEndpoint memberEndpoint = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/DiskStoreDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/DiskStoreDetails.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/DiskStoreDetails.java
index f23622d..71016b9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/DiskStoreDetails.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/DiskStoreDetails.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * @see java.lang.Comparable
  * @see java.lang.Iterable
  * @see java.util.UUID
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class DiskStoreDetails implements Comparable<DiskStoreDetails>, MutableIdentifiable<UUID>, Iterable<DiskStoreDetails.DiskDirDetails>, Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/IndexDetails.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/IndexDetails.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/IndexDetails.java
index 7b80ba3..cb26ec3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/IndexDetails.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/domain/IndexDetails.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * @see com.gemstone.gemfire.cache.query.IndexStatistics
  * @see com.gemstone.gemfire.cache.query.IndexType
  * @see com.gemstone.gemfire.distributed.DistributedMember
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class IndexDetails implements Comparable<IndexDetails>, Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/CreateSubregionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/CreateSubregionException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/CreateSubregionException.java
index 3af3af3..d51ca6a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/CreateSubregionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/exceptions/CreateSubregionException.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.exceptions;
 /**
  * Indicates inability to create a Subregion of a region.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 // TODO - Abhishek - Include in GemFire Exception Enhancements
 public class CreateSubregionException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java
index d4451ea..6e67cc6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ContunuousQueryFunction.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class ContunuousQueryFunction implements Function, InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
index 695fbfb..32e8f83 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateAsyncEventQueueFunction.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management.internal.cli.functions;
  * Function used by the 'create async-event-queue' gfsh command to create an
  * asynchronous event queue on a member.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateDiskStoreFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateDiskStoreFunction.java
index 9e52e43..424f44c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateDiskStoreFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/CreateDiskStoreFunction.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.management.internal.cli.functions;
  * Function used by the 'create disk-store' gfsh command to create a disk store
  * on each member.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 import org.apache.logging.log4j.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunction.java
index ee4f45e..409e85b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DescribeDiskStoreFunction.java
@@ -55,7 +55,7 @@ import org.apache.logging.log4j.Logger;
  * @see com.gemstone.gemfire.cache.execute.FunctionContext
  * @see com.gemstone.gemfire.internal.InternalEntity
  * @see com.gemstone.gemfire.management.internal.cli.domain.DiskStoreDetails
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class DescribeDiskStoreFunction extends FunctionAdapter implements InternalEntity {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DestroyDiskStoreFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DestroyDiskStoreFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DestroyDiskStoreFunction.java
index 5c91577..8e8c48b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DestroyDiskStoreFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DestroyDiskStoreFunction.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * Function used by the 'destroy disk-store' gfsh command to destroy a disk
  * store on each member.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class DestroyDiskStoreFunction extends FunctionAdapter implements InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/FetchRegionAttributesFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/FetchRegionAttributesFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/FetchRegionAttributesFunction.java
index c693039..4760c6c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/FetchRegionAttributesFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/FetchRegionAttributesFunction.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FetchRegionAttributesFunction extends FunctionAdapter {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListAsyncEventQueuesFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
index b410611..2bc35bd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.management.internal.cli.domain.AsyncEventQueueDetail
  * async event queues that exist for the entire cache, distributed across the
  * GemFire distributed system. </p>
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class ListAsyncEventQueuesFunction extends FunctionAdapter implements InternalEntity {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunction.java
index 427b6c1..95c485d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDiskStoresFunction.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.management.internal.cli.domain.DiskStoreDetails;
  * @see com.gemstone.gemfire.cache.execute.FunctionContext
  * @see com.gemstone.gemfire.internal.InternalEntity
  * @see com.gemstone.gemfire.management.internal.cli.domain.DiskStoreDetails
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ListDiskStoresFunction extends FunctionAdapter implements InternalEntity {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDurableCqNamesFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDurableCqNamesFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDurableCqNamesFunction.java
index fb49df8..14e9450 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDurableCqNamesFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListDurableCqNamesFunction.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
  * @see com.gemstone.gemfire.cache.execute.FunctionContext
  * @see com.gemstone.gemfire.internal.InternalEntity
  * @see com.gemstone.gemfire.management.internal.cli.domain.IndexDetails
- * @since 7.0.1
+ * @since GemFire 7.0.1
  */
 @SuppressWarnings("unused")
 public class ListDurableCqNamesFunction extends FunctionAdapter implements InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunction.java
index 350a001..4bf1cae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ListIndexFunction.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.management.internal.cli.domain.IndexDetails;
  * @see com.gemstone.gemfire.cache.execute.FunctionContext
  * @see com.gemstone.gemfire.internal.InternalEntity
  * @see com.gemstone.gemfire.management.internal.cli.domain.IndexDetails
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 public class ListIndexFunction extends FunctionAdapter implements InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/LogFileFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/LogFileFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/LogFileFunction.java
index 870f6be..98f3cbd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/LogFileFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/LogFileFunction.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.management.internal.cli.util.ReadWriteFile;
 // TODO:LOG:CONVERT: supports log-file only -- update to support Log4J 2 as well?
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LogFileFunction implements Function, InternalEntity {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/MembersForRegionFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/MembersForRegionFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/MembersForRegionFunction.java
index 4581cd2..8f7976a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/MembersForRegionFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/MembersForRegionFunction.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class MembersForRegionFunction implements Function, InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/NetstatFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/NetstatFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/NetstatFunction.java
index 4d04806..eaad818 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/NetstatFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/NetstatFunction.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 /**
  * Executes 'netstat' OS command & returns the result as compressed bytes.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class NetstatFunction implements Function, InternalEntity {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionAlterFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionAlterFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionAlterFunction.java
index 1c11929..3a66a81 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionAlterFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionAlterFunction.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
  * Function used by the 'alter region' gfsh command to alter a region on each
  * member.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class RegionAlterFunction extends FunctionAdapter implements InternalEntity {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionCreateFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionCreateFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionCreateFunction.java
index fd5db59..2344074 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionCreateFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionCreateFunction.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
 
 /**
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionCreateFunction extends FunctionAdapter implements InternalEntity {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionDestroyFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionDestroyFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionDestroyFunction.java
index e0fd6e6..fa86e4e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionDestroyFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionDestroyFunction.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class RegionDestroyFunction implements Function, InternalEntity {
   private static final long serialVersionUID = 9172773671865750685L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionFunctionArgs.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionFunctionArgs.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionFunctionArgs.java
index 98bde7e..1d8f465 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionFunctionArgs.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/RegionFunctionArgs.java
@@ -19,7 +19,7 @@
  * Used to carry arguments between gfsh region command implementations and the functions
  * that do the work for those commands.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/UserFunctionExecution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/UserFunctionExecution.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/UserFunctionExecution.java
index 1bf6cc8..46054c6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/UserFunctionExecution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/UserFunctionExecution.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class UserFunctionExecution implements Function, InternalEntity {
   public static final String ID = UserFunctionExecution.class.getName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
index 8aa1f79..4b93a37 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CliTopic implements Comparable<CliTopic> {
   private static final Map<String, String> nameDescriptionMap = new HashMap<String, String>();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/format/NewHelp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/format/NewHelp.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/format/NewHelp.java
index f4535ab..dd4ab6b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/format/NewHelp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/format/NewHelp.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class NewHelp {
   DataNode root;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index d632dff..0e2508a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.Option;
 import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
 
 /**
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class HelpUtils {
   public static final String EXE_PREFIX_FOR_EXTERNAL_HELP = com.gemstone.gemfire.management.internal.cli.shell.Gfsh.GFSH_APP_NAME + " ";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 241c9e2..1a0f2ae 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
  * in classes under <code>com.gemstone.gemfire.management.internal.cli</code>
  * for Command Line Interface (CLI).
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 /*-
  * NOTES:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonArray.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonArray.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonArray.java
index cd5e000..f00cc2c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonArray.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonArray.java
@@ -27,7 +27,7 @@ import org.json.JSONException;
  * Wrapper over JSONArray.
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfJsonArray {
   private JSONArray jsonArray;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonException.java
index 09fe545..8b63f70 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.management.internal.cli.json;
  * 
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfJsonException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonObject.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonObject.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonObject.java
index 83899e8..1849066 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonObject.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/json/GfJsonObject.java
@@ -30,7 +30,7 @@ import org.json.JSONObject;
  * Wrapper over JSONObject. 
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfJsonObject {
   public static final Object NULL = JSONObject.NULL;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Argument.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Argument.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Argument.java
index 6ca7fa1..2da2eb4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Argument.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Argument.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.parser;
 /**
  * Argument of a Command
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class Argument extends Parameter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/AvailabilityTarget.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/AvailabilityTarget.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/AvailabilityTarget.java
index 572fbf6..97ea58d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/AvailabilityTarget.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/AvailabilityTarget.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 /**
  * Used for checking availability of a command
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class AvailabilityTarget {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/CommandTarget.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/CommandTarget.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/CommandTarget.java
index faa44ff..f665e75 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/CommandTarget.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/CommandTarget.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.GfshParser;
 /**
  * Used by {@link GfshParser} to store details of a command
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class CommandTarget {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshMethodTarget.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshMethodTarget.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshMethodTarget.java
index 9ba520a..c54cabd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshMethodTarget.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshMethodTarget.java
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
 /**
  * A method that can be executed via a shell command.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GfshMethodTarget {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshOptionParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshOptionParser.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshOptionParser.java
index 2712712..5852dff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshOptionParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/GfshOptionParser.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.management.internal.cli.exceptions.CliException;
 /**
  * Delegate used for parsing by {@link GfshParser}
  *  
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface GfshOptionParser {
 	public void setArguments(LinkedList<Argument> arguments);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/MethodParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/MethodParameter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/MethodParameter.java
index 1e79bf7..7fe00f9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/MethodParameter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/MethodParameter.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.parser;
 /**
  * Object used for ordering method parameters
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class MethodParameter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Option.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Option.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Option.java
index 1d115ce..73bf3ed 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Option.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Option.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.Preproce
 /**
  * Option of a Command
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class Option extends Parameter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/OptionSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/OptionSet.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/OptionSet.java
index f39daf7..6edcd37 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/OptionSet.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/OptionSet.java
@@ -23,7 +23,7 @@ import java.util.Map;
 /**
  * Stores the result after parsing
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public class OptionSet {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Parameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Parameter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Parameter.java
index bb478eb..8567522 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Parameter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/Parameter.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.Preproce
 /**
  * Parameter of a Command
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class Parameter {
   // help for the Parameter

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtils.java
index 1ccaff0..4d8d7a4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/ParserUtils.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.Preproce
  * The methods herein always ensure that the syntax is proper before performing
  * the desired operation
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ParserUtils {
   public static String[] split(String input, String splitAround) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/SyntaxConstants.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/SyntaxConstants.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/SyntaxConstants.java
index db8540f..325d101 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/SyntaxConstants.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/SyntaxConstants.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.parser;
 /**
  * Syntax constants for the parser
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 // TODO merge with CliConstants

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
index 4ea9516..db9d708 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.preprocessor.TrimmedI
  * Newly constructed JoptOptionParser must be loaded with arguments and
  * options before parsing command strings.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JoptOptionParser implements GfshOptionParser {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/EnclosingCharacters.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/EnclosingCharacters.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/EnclosingCharacters.java
index e965bcc..26587fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/EnclosingCharacters.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/EnclosingCharacters.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.parser.preprocessor;
 /**
  * Used for Supporting enclosed input
  * 
- * @since 7.0
+ * @since GemFire 7.0
  *
  */
 public final class EnclosingCharacters {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/Preprocessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/Preprocessor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/Preprocessor.java
index 518c595..e816f3c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/Preprocessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/Preprocessor.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
  * It will split the user input into an array of strings as per the specifications of the command for e.g; Different
  * command might require different value separators, different value specifiers and many more customizations
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class Preprocessor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtils.java
index f1669b5..382f325 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/PreprocessorUtils.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
  * The methods in this class will be used by the {@link Preprocessor} class to
  * perform various trivial operations
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class PreprocessorUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/TrimmedInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/TrimmedInput.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/TrimmedInput.java
index e5b30b7..04eb22e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/TrimmedInput.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/preprocessor/TrimmedInput.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.parser.preprocessor;
 /**
  * Used for trimming input before Pre-processing
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public class TrimmedInput {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandExecutionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandExecutionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandExecutionContext.java
index a426ea6..94a6b07 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandExecutionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandExecutionContext.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandExecutionContext {
   // ThreadLocal variables that can be uses by commands

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandProcessor.java
index 69bc64e..bc4ab9e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandProcessor.java
@@ -39,7 +39,7 @@ import org.springframework.shell.event.ParseResult;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandProcessor {
   protected RemoteExecutionStrategy executionStrategy;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandStatementImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandStatementImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandStatementImpl.java
index a5d3466..7b88d8c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandStatementImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/CommandStatementImpl.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.management.cli.Result;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandStatementImpl implements CommandStatement {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/RemoteExecutionStrategy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/RemoteExecutionStrategy.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/RemoteExecutionStrategy.java
index b4fe52e..2411047 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/RemoteExecutionStrategy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/RemoteExecutionStrategy.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.management.internal.cli.result.ResultBuilder;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 // Doesn't have to be org.springframework.roo.shell.ExecutionStrategy
 public class RemoteExecutionStrategy {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/WrapperThreadLocal.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/WrapperThreadLocal.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/WrapperThreadLocal.java
index 7b883cb..a7c7b18 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/WrapperThreadLocal.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/remote/WrapperThreadLocal.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.management.internal.cli.remote;
  * @param <T>
  *          Type of ThreadLocal variable
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class WrapperThreadLocal<T> extends ThreadLocal<T> {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/AbstractResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/AbstractResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/AbstractResultData.java
index d79a556..0f3c3b9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/AbstractResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/AbstractResultData.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class AbstractResultData implements ResultData {
   public static final String SECTION_DATA_ACCESSOR = "__sections__";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializable.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializable.java
index f752586..ba72af3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializable.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface CliJsonSerializable extends CliJsonSerializableIds {
   String FIELDS_TO_SKIP                = "fieldNameToDisplayName, JSId, outputFormat, fieldsToSkipOnUI";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializableIds.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializableIds.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializableIds.java
index 76ee656..c36b1f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializableIds.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CliJsonSerializableIds.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.management.internal.cli.result;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface CliJsonSerializableIds {
   /* sample objects 11-20 */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResult.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResult.java
index 98e8fec..d591e7e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResult.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.management.internal.cli.result.TableBuilder.Table;
 /**
  * Wraps the Result of a command execution. 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 //Should this have info about the command String??
 public class CommandResult implements Result {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResultException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResultException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResultException.java
index 2e4b2e1..b310bf3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResultException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CommandResultException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.management.cli.Result;
 /**
  * Exception wrapper around a command result.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CommandResultException extends Exception {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CompositeResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CompositeResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CompositeResultData.java
index 17db3e6..0569032 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CompositeResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/CompositeResultData.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class CompositeResultData extends AbstractResultData {
   public static String SEPARATOR = "__separator__";
@@ -132,7 +132,7 @@ public class CompositeResultData extends AbstractResultData {
   
   /**
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class SectionResultData /*extends AbstractResultData*/ {
     protected GfJsonObject sectionGfJsonObject;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ErrorResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ErrorResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ErrorResultData.java
index b324c8e..73422af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ErrorResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ErrorResultData.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ErrorResultData extends InfoResultData {
   private static final String ERROR_CODE = "errorCode";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/FileResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/FileResult.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/FileResult.java
index 07a66d8..44780fe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/FileResult.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/FileResult.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class FileResult implements Result {
   private String[] filePaths;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/InfoResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/InfoResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/InfoResultData.java
index 82265ce..8a2aa07 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/InfoResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/InfoResultData.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class InfoResultData extends AbstractResultData {
   public static final String RESULT_CONTENT_MESSAGE = "message";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ObjectResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ObjectResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ObjectResultData.java
index 186156e..b18f8a8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ObjectResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ObjectResultData.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ObjectResultData<T extends CliJsonSerializable> extends AbstractResultData {
   public static final String OBJECTS_ACCESSOR = "__objects__";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultBuilder.java
index 55f7a89..6c7e0f6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultBuilder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultBuilder.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ResultBuilder {
   public static final int CODE_SHELLCLIENT_ABORT_OP   = 110;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultData.java
index b121b23..aec2895 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultData.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public interface ResultData {
   String RESULT_HEADER  = "header";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultDataException.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultDataException.java
index f0c01da..dc44580 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultDataException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/ResultDataException.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.management.internal.cli.result;
 
 /**
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ResultDataException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TableBuilder.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TableBuilder.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TableBuilder.java
index 8686953..176eb72 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TableBuilder.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TableBuilder.java
@@ -57,7 +57,7 @@ package com.gemstone.gemfire.management.internal.cli.result;
  * </literal>
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 import java.util.ArrayList;
 import java.util.List;
@@ -172,7 +172,7 @@ public class TableBuilder {
    * when built will automatically be set to the length of the longest value in
    * the column.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static class RowGroup {
     private final Table table;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TabularResultData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TabularResultData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TabularResultData.java
index 307fb68..91e2cba 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TabularResultData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/result/TabularResultData.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.json.GfJsonObject;
 /**
  * 
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class TabularResultData extends AbstractResultData {
   /*package*/TabularResultData() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
index 68c3eeb..6f4e351 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java
@@ -88,7 +88,7 @@ import jline.console.ConsoleReader;
  * information like: environment TODO
  *
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class Gfsh extends JLineShell {
   public static final int     DEFAULT_APP_FETCH_SIZE                 = 1000;



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipEvent.java
index 6be3faa..1c91fb2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipEvent.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * An event delivered to a {@link ClientMembershipListener} when this process
  * detects connection changes to ClientServers or clients.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ClientMembershipEvent {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListener.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListener.java
index 4788e08..49d61d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListener.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.management.membership;
  *
  * @see ClientMembership#registerClientMembershipListener
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface ClientMembershipListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListenerAdapter.java
index cf148de..4aafb36 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/ClientMembershipListenerAdapter.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.management.membership;
  * Applications can subclass this class and only override the methods for the
  * events of interest.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class ClientMembershipListenerAdapter implements ClientMembershipListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipEvent.java
index f7e1e0a..7d32b00 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipEvent.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * Instances of this are delivered to a {@link MembershipListener} when a member
  * has joined or left the distributed system.
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface MembershipEvent {
   /**
@@ -35,7 +35,7 @@ public interface MembershipEvent {
    * Returns the {@link DistributedMember} that this event originated in.
    * 
    * @return the member that performed the operation that originated this event.
-   * @since 8.0
+   * @since GemFire 8.0
    */
   public DistributedMember getDistributedMember();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipListener.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipListener.java
index 209f2fa..c14c7cf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/MembershipListener.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.management.membership;
  *
  * @see com.gemstone.gemfire.management.ManagementService#addMembershipListener
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 public interface MembershipListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/management/membership/UniversalMembershipListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/UniversalMembershipListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/UniversalMembershipListenerAdapter.java
index fa80007..8849180 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/membership/UniversalMembershipListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/membership/UniversalMembershipListenerAdapter.java
@@ -145,7 +145,7 @@ import com.gemstone.gemfire.management.ManagementService;
  * </p>
  *
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class UniversalMembershipListenerAdapter implements MembershipListener{
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/FieldType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/FieldType.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/FieldType.java
index 5c7bb77..36fbdd9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/FieldType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/FieldType.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.pdx.internal.DataSize;
  * Some field types are always serialized with a certain number of bytes; these are called "fixed-width".
  * Others are serialized with a variable number of bytes; these are called "variable-width".
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public enum FieldType {
   BOOLEAN(true, DataSize.BOOLEAN_SIZE, "boolean", new byte[]{0},false),

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/NonPortableClassException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/NonPortableClassException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/NonPortableClassException.java
index 948f97c..7f7f93d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/NonPortableClassException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/NonPortableClassException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.pdx;
  * Thrown if "check-portability" is enabled and an attempt is made to
  * pdx serialize a class that is not portable to non-java platforms.
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class NonPortableClassException extends PdxSerializationException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxConfigurationException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxConfigurationException.java
index e19e384..7ad11b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxConfigurationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxConfigurationException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.GemFireException;
 
 /**
  * Thrown when a configuration that is now allowed by PDX is detected.
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class PdxConfigurationException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldAlreadyExistsException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldAlreadyExistsException.java
index 62b2747..9fd5a8f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldAlreadyExistsException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldAlreadyExistsException.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.GemFireException;
  * <p>It can also be caused by {@link PdxWriter#writeUnreadFields(PdxUnreadFields) writeUnreadFields}
  * being called after a field is written.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class PdxFieldAlreadyExistsException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldDoesNotExistException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldDoesNotExistException.java
index 2ca51c0..a5fb24e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldDoesNotExistException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldDoesNotExistException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown when a PDX field does not exist and the current operation requires its existence.
  * PDX fields exist after they are written by one of the writeXXX methods on {@link PdxWriter}.
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class PdxFieldDoesNotExistException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldTypeMismatchException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldTypeMismatchException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldTypeMismatchException.java
index 739746b..5013759 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldTypeMismatchException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxFieldTypeMismatchException.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.GemFireException;
  * The writeXXX methods on {@link PdxWriter} define the field type.
  * <p>This exception can also be caused by {@link WritablePdxInstance#setField(String, Object) setField}
  * trying to set a value whose type is not compatible with the field.
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class PdxFieldTypeMismatchException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInitializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInitializationException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInitializationException.java
index 0d1e655..5ae27d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInitializationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInitializationException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.GemFireException;
 /**
  * Thrown if the PDX system could not be successfully initialized.
  * The cause will give the detailed reason why initialization failed.
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class PdxInitializationException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
index 1a46d34..3c4009f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstance.java
@@ -48,14 +48,14 @@ import com.gemstone.gemfire.cache.client.ClientCacheFactory;
  * PdxReader will return a default value for the added field even though version 1
  * has no knowledge of it.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface PdxInstance extends java.io.Serializable {
 
   /**
    * Return the full name of the class that this pdx instance represents.
    * @return the name of the class that this pdx instance represents.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public String getClassName();
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstanceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstanceFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstanceFactory.java
index 88e588f..50d9195 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstanceFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxInstanceFactory.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.RegionService;
  * multiple factories or use {@link PdxInstance#createWriter()} to create subsequent instances.
  * Using {@link PdxInstance#createWriter()} is usually faster.
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public interface PdxInstanceFactory {
   /**
@@ -222,7 +222,7 @@ public interface PdxInstanceFactory {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws PdxSerializationException if checkPortability is true and a non-portable object is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxInstanceFactory writeObject(String fieldName, Object value, boolean checkPortability);
 
@@ -353,7 +353,7 @@ public interface PdxInstanceFactory {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws PdxSerializationException if checkPortability is true and a non-portable element is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxInstanceFactory writeObjectArray(String fieldName, Object[] value, boolean checkPortability);
   /**
@@ -445,7 +445,7 @@ public interface PdxInstanceFactory {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws PdxSerializationException if checkPortability is true and a non-portable object is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public <CT, VT extends CT> PdxInstanceFactory writeField(String fieldName, VT fieldValue, Class<CT> fieldType, boolean checkPortability);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxReader.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxReader.java
index 24db2f3..0a4f527 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxReader.java
@@ -31,7 +31,7 @@ import java.util.Date;
  * <P> The methods on this interface are not thread safe so do not
  * call them concurrently, on the same instance, from more than one thread.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface PdxReader {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializable.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializable.java
index c1f1294..e3d2e0c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializable.java
@@ -51,7 +51,7 @@ public class User implements PdxSerializable {
 }
  * </PRE>
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public interface PdxSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializationException.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializationException.java
index 413d656..e189633 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializationException.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.SerializationException;
  * or deserialization of a PDX. In most cases consult the cause for
  * a description of the problem.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class PdxSerializationException extends SerializationException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializer.java
index 5ece0d8..607d0b2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxSerializer.java
@@ -66,7 +66,7 @@ public class MyPdxSerializer implements PdxSerializer {
 }
  * </PRE>
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface PdxSerializer {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxUnreadFields.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxUnreadFields.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxUnreadFields.java
index 6b7d4dc..045a0ba 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxUnreadFields.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxUnreadFields.java
@@ -34,7 +34,7 @@ package com.gemstone.gemfire.pdx;
  * but to reduce the performance and memory overhead of automatic preservation it is recommended
  * that use {@link PdxReader#readUnreadFields() readUnreadFields} if possible.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public interface PdxUnreadFields {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxWriter.java
index 64956eb..08b5ca4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/PdxWriter.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
  * <p>All methods on this interface return itself to allow method calls to be
  * chained together.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface PdxWriter {
   
@@ -219,7 +219,7 @@ public interface PdxWriter {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws NonPortableClassException if checkPortability is true and a non-portable object is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxWriter writeObject(String fieldName, Object value, boolean checkPortability);
 
@@ -350,7 +350,7 @@ public interface PdxWriter {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws NonPortableClassException if checkPortability is true and a non-portable element is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public PdxWriter writeObjectArray(String fieldName, Object[] value, boolean checkPortability);
   /**
@@ -442,7 +442,7 @@ public interface PdxWriter {
    * @throws PdxFieldAlreadyExistsException if the named field has already been written
    * @throws NonPortableClassException if checkPortability is true and a non-portable object is serialized
    * @throws PdxSerializationException if serialization of the field fails.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public <CT, VT extends CT> PdxWriter writeField(String fieldName, VT fieldValue, Class<CT> fieldType, boolean checkPortability);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/ReflectionBasedAutoSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/ReflectionBasedAutoSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/ReflectionBasedAutoSerializer.java
index e505ebe..2b7ae88 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/ReflectionBasedAutoSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/ReflectionBasedAutoSerializer.java
@@ -61,7 +61,7 @@ import java.util.Properties;
  * See {@link ReflectionBasedAutoSerializer#reconfigure(String...) reconfigure}
  * for additional details on the format of the parameter string.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable {
 
@@ -149,7 +149,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * 
    * @param patterns the patterns which are matched against domain class
    *  names to determine whether they should be serialized
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public ReflectionBasedAutoSerializer(String... patterns) {
     this(false, patterns);
@@ -187,7 +187,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *  non-java languages.
    * @param patterns the patterns which are matched against domain class
    *  names to determine whether they should be serialized
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public ReflectionBasedAutoSerializer(boolean checkPortability, String... patterns) {
     // We allow this class to escape its constructor so that our delegate can
@@ -259,7 +259,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * order of the patterns is not relevant.
    * 
    * @param patterns the definitions to apply
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public final void reconfigure(String... patterns) {
     reconfigure(false, patterns);
@@ -295,7 +295,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * @param checkPortability if <code>true</code> then an serialization done by
    * this serializer will throw an exception if the object it not portable to
    * non-java languages.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public final void reconfigure(boolean checkPortability, String... patterns) {
     this.manager.reconfigure(checkPortability, patterns);
@@ -385,7 +385,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * will be remembered and used the next time the same class is seen.
    * @param clazz the class that is being considered for auto serialization.
    * @return true if instances of the class should be auto serialized; false if not.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public boolean isClassAutoSerialized(Class<?> clazz) {
     return this.manager.defaultIsClassAutoSerialized(clazz);
@@ -410,7 +410,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *   Note that this field may have been inherited from a super class by this class.
    *   If you want to find the class that declared this field use {@link Field#getDeclaringClass()}.
    * @return true if the field should be serialized as a pdx field; false if it should be ignored.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public boolean isFieldIncluded(Field f, Class<?> clazz) {
     return this.manager.defaultIsFieldIncluded(f, clazz);
@@ -431,7 +431,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *   Note that this field may have been inherited from a super class by this class.
    *   If you want to find the class that declared this field use {@link Field#getDeclaringClass()}.
    * @return the name of the field
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public String getFieldName(Field f, Class<?> clazz) {
     return f.getName();
@@ -455,7 +455,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *   Note that this field may have been inherited from a super class by this class.
    *   If you want to find the class that declared this field use {@link Field#getDeclaringClass()}.
    * @return true if the field should be marked as an identity field; false if not.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public boolean isIdentityField(Field f, Class<?> clazz) {
     return this.manager.defaultIsIdentityField(f, clazz);
@@ -476,7 +476,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *   Note that this field may have been inherited from a super class by this class.
    *   If you want to find the class that declared this field use {@link Field#getDeclaringClass()}.
    * @return the pdx field type of the given domain class field.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public FieldType getFieldType(Field f, Class<?> clazz) {
     return this.manager.defaultGetFieldType(f, clazz);
@@ -498,7 +498,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    *   If you want to find the class that declared this field use {@link Field#getDeclaringClass()}.
    * @return true if the {@link #writeTransform} and {@link #readTransform} need to be called
    * when serializing and deserializing this field's value.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public boolean transformFieldValue(Field f, Class<?> clazz) {
     return false;
@@ -516,7 +516,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * @param originalValue the value of the field that was read from the domain object. 
    * @return the actual value to write for this field. Return <code>originalValue</code>
    *   if you decide not to transform the value. 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public Object writeTransform(Field f, Class<?> clazz, Object originalValue) {
     return originalValue;
@@ -534,7 +534,7 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
    * @param serializedValue the value of the field that was serialized for this field.
    * @return the actual value to write for this field. Return <code>serializedValue</code>
    *   if you decide not to transform the value. 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public Object readTransform(Field f, Class<?> clazz, Object serializedValue) {
     return serializedValue;
@@ -542,14 +542,14 @@ public class ReflectionBasedAutoSerializer implements PdxSerializer, Declarable
   /**
    * Returns the cache that this serializer is installed on.
    * Returns null if it is not installed.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public final RegionService getRegionService() {
     return this.manager.getRegionService();
   }
   /**
    * For internal use only.
-   * @since 8.2
+   * @since GemFire 8.2
    */
   public final Object getManager() {
     // The result is not AutoSerializableManager because

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/WritablePdxInstance.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/WritablePdxInstance.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/WritablePdxInstance.java
index 6c1441d..0f26de2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/WritablePdxInstance.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/WritablePdxInstance.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.pdx;
  * using the {@link #setField setField} method. 
  * To get a WritablePdxInstance call {@link PdxInstance#createWriter createWriter}.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public interface WritablePdxInstance extends PdxInstance {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
index 11df1a4..5d66622 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper;
  * will have its own instance of this class. We allow instances of this class to be found
  * so that tests can access internal apis that are not exposed on the public ReflectionBasedAutoSerializer.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public class AutoSerializableManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/DataSize.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/DataSize.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/DataSize.java
index da41b11..383064d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/DataSize.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/DataSize.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.pdx.internal;
  * This is a helper class that defines the size of the
  * primitive java types.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class DataSize {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/InternalPdxReader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/InternalPdxReader.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/InternalPdxReader.java
index 1dd3985..e7c0dda 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/InternalPdxReader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/InternalPdxReader.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.AutoClassInfo;
 
 /**
  * Adds additional methods for reading pdx fields for internal use.
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public interface InternalPdxReader extends PdxReader {
   public PdxField getPdxField(String fieldName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxField.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxField.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxField.java
index c662a2c..2042148 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxField.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxField.java
@@ -54,7 +54,7 @@ public class PdxField implements DataSerializable, Comparable<PdxField> {
   
   /**
    * Set to true by the pdx delete-field gfsh command
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private boolean deleted;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInputStream.java
index 7d86090..56eec08 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInputStream.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.tcp.ImmutableByteBufferInputStream;
 /**
  * Used by PdxReaderImpl to manage the raw bytes of a PDX.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class PdxInputStream extends ImmutableByteBufferInputStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceEnum.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceEnum.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceEnum.java
index 4faf4e5..5d149ac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceEnum.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceEnum.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.pdx.WritablePdxInstance;
 import com.gemstone.gemfire.pdx.internal.EnumInfo.PdxInstanceEnumInfo;
 /**
  * Used to represent an enum value as a PdxInstance
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class PdxInstanceEnum implements PdxInstance, Sendable, ConvertableToBytes, ComparableEnum {
   private static final long serialVersionUID = -7417287878052772302L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceInputStream.java
index 2635514..8d938f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxInstanceInputStream.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.pdx.PdxSerializationException;
  * Fixed width fields on this implementation do not change the position
  * but instead use absolute positions.
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class PdxInstanceInputStream extends PdxInputStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
index 6771117..0513d5e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxReaderImpl.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.PdxFieldWrapper
  * It is also used as the base class of our {@link PdxInstance} implementation.
  * It is serializable because PdxInstance is.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  * @see InternalDataSerializer#readPdxSerializable(java.io.DataInput)
  */
 public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxString.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxString.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxString.java
index cbe76d6..c7740dd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxString.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxString.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream;
  * A class that references the String offset in PdxInstance
  * Used as Index keys for PdxInstances and 
  * query evaluation for PdxInstances
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class PdxString implements Comparable<PdxString>, Sendable {
   private final byte[] bytes;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxType.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxType.java
index 00d87de..9246108 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxType.java
@@ -53,7 +53,7 @@ public class PdxType implements DataSerializable {
   private boolean noDomainClass;
   /**
    * Will be set to true if any fields on this type have been deleted.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   private boolean hasDeletedField;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxUnreadData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxUnreadData.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxUnreadData.java
index d32c90e..ef0b8c8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxUnreadData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxUnreadData.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.pdx.PdxUnreadFields;
 
 /**
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class PdxUnreadData implements PdxUnreadFields {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
index df2ab37..9a08909 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.AutoClassInfo;
  * {@link PdxSerializable}. But it may share the underlying instance
  * of {@link HeapDataOutputStream} with other instances of this class.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  * @see InternalDataSerializer#basicWriteObject(Object, java.io.DataOutput, boolean)
  */
 public class PdxWriterImpl implements PdxWriter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TrackingPdxReaderImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TrackingPdxReaderImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TrackingPdxReaderImpl.java
index 8607fb4..7c1655a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TrackingPdxReaderImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TrackingPdxReaderImpl.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.PdxFieldWrapper
  * Used to track what fields are actually read by the user's code.
  * We want to know what fields are not read so that we can preserve them.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class TrackingPdxReaderImpl implements InternalPdxReader {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/UnreadPdxType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/UnreadPdxType.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/UnreadPdxType.java
index 19de606..f21983c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/UnreadPdxType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/UnreadPdxType.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.pdx.internal;
  * Note that instances of the class are only kept locally so I didn't add code
  * to serialize unreadFieldIndexes.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class UnreadPdxType extends PdxType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/WeakConcurrentIdentityHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/WeakConcurrentIdentityHashMap.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/WeakConcurrentIdentityHashMap.java
index c349535..6b78d03 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/WeakConcurrentIdentityHashMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/WeakConcurrentIdentityHashMap.java
@@ -47,7 +47,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * <p>
  * Note: this code came from the jdk from the package: com.sun.jmx.mbeanserver.
  * I modified it to use a ConcurrentMap.
- * @since 6.6
+ * @since GemFire 6.6
  */
 class WeakConcurrentIdentityHashMap<K, V> {
     private WeakConcurrentIdentityHashMap() {}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/AccessControl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/AccessControl.java b/geode-core/src/main/java/com/gemstone/gemfire/security/AccessControl.java
index b292ee9..eff2a62 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/AccessControl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/AccessControl.java
@@ -38,7 +38,7 @@ import java.security.Principal;
  * class is created for each connection from the client/peer and the
  * <code>authorizeOperation</code> method invoked before/after each operation.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface AccessControl extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/AuthInitialize.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthInitialize.java b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthInitialize.java
index 8848063..400c665 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthInitialize.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthInitialize.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
  * <i>security-peer-auth-init</i> system property on peers and as the
  * <i>security-client-auth-init</i> system property on clients.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface AuthInitialize extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationFailedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationFailedException.java b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationFailedException.java
index 7647e5c..3ab728f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationFailedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationFailedException.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.security;
 /**
  * Thrown if authentication of this client/peer fails.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class AuthenticationFailedException extends GemFireSecurityException {
 private static final long serialVersionUID = -8202866472279088879L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationRequiredException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationRequiredException.java b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationRequiredException.java
index 65ed6ce..f67af39 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationRequiredException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/AuthenticationRequiredException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.security;
  * Thrown if the distributed system is in secure mode and this client/peer has
  * not set the security credentials.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class AuthenticationRequiredException extends GemFireSecurityException {
 private static final long serialVersionUID = 4675976651103154919L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/Authenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/Authenticator.java b/geode-core/src/main/java/com/gemstone/gemfire/security/Authenticator.java
index 35e05e5..747aa5d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/Authenticator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/Authenticator.java
@@ -40,7 +40,7 @@ import java.util.Properties;
  * <code>public static Authenticator [method-name]();</code> i.e. it should be
  * a zero argument function.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public interface Authenticator extends CacheCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java b/geode-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
index e8182fe..049137d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/GemFireSecurityException.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.GemFireException;
  * The base class for all com.gemstone.gemfire.security package related
  * exceptions.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class GemFireSecurityException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/security/NotAuthorizedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/security/NotAuthorizedException.java b/geode-core/src/main/java/com/gemstone/gemfire/security/NotAuthorizedException.java
index f60a007..2e834f8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/security/NotAuthorizedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/security/NotAuthorizedException.java
@@ -24,7 +24,7 @@ import javax.naming.NamingException;
 /**
  * Thrown when a client/peer is unauthorized to perform a requested operation.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class NotAuthorizedException extends GemFireSecurityException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/cacheRunner/Portfolio.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/cacheRunner/Portfolio.java b/geode-core/src/test/java/cacheRunner/Portfolio.java
index fb0de20..5dd2b7e 100644
--- a/geode-core/src/test/java/cacheRunner/Portfolio.java
+++ b/geode-core/src/test/java/cacheRunner/Portfolio.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.cache.Declarable;
  * this class is <code>Declarable</code>, we can describe instances of
  * it in a GemFire <code>cache.xml</code> file.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class Portfolio implements Declarable, Serializable {
   private int id;  /* id is used as the entry key and is stored in the entry */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/cacheRunner/Position.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/cacheRunner/Position.java b/geode-core/src/test/java/cacheRunner/Position.java
index 24d044a..4e7e6e1 100644
--- a/geode-core/src/test/java/cacheRunner/Position.java
+++ b/geode-core/src/test/java/cacheRunner/Position.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.Declarable;
  * this class is <code>Declarable</code>, we can describe instances of
  * it in a GemFire <code>cache.xml</code> file.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class Position implements Declarable, Serializable {
   private String secId;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/app/Customer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/app/Customer.java b/geode-core/src/test/java/com/company/app/Customer.java
index e9c4131..a423cb4 100644
--- a/geode-core/src/test/java/com/company/app/Customer.java
+++ b/geode-core/src/test/java/com/company/app/Customer.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.Declarable;
 /**
  * A class that is <code>Declarable</code>
  *
- * @since 3.2.1
+ * @since GemFire 3.2.1
  */
 public class Customer implements Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/app/DBLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/app/DBLoader.java b/geode-core/src/test/java/com/company/app/DBLoader.java
index a8034d9..a1e8942 100644
--- a/geode-core/src/test/java/com/company/app/DBLoader.java
+++ b/geode-core/src/test/java/com/company/app/DBLoader.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.*;
 /**
  * A <code>CacheLoader</code> that is <code>Declarable</code>
  *
- * @since 3.2.1
+ * @since GemFire 3.2.1
  */
 public class DBLoader implements CacheLoader, Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/app/OrdersCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/app/OrdersCacheListener.java b/geode-core/src/test/java/com/company/app/OrdersCacheListener.java
index 8c4c67f..266b7c6 100755
--- a/geode-core/src/test/java/com/company/app/OrdersCacheListener.java
+++ b/geode-core/src/test/java/com/company/app/OrdersCacheListener.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.*;
 /**
  * com.company.app.OrdersCacheListener. Cache listener impl for CacheXmlxxTest
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class OrdersCacheListener implements CacheListener, Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/data/DatabaseLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/data/DatabaseLoader.java b/geode-core/src/test/java/com/company/data/DatabaseLoader.java
index 6e070f4..5742289 100644
--- a/geode-core/src/test/java/com/company/data/DatabaseLoader.java
+++ b/geode-core/src/test/java/com/company/data/DatabaseLoader.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.*;
 /**
  * A <code>CacheLoader</code> that is <code>Declarable</code>
  *
- * @since 3.2.1
+ * @since GemFire 3.2.1
  */
 public class DatabaseLoader implements CacheLoader, Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/data/MyDeclarable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/data/MyDeclarable.java b/geode-core/src/test/java/com/company/data/MyDeclarable.java
index d6e24bd..bb9c8da 100644
--- a/geode-core/src/test/java/com/company/data/MyDeclarable.java
+++ b/geode-core/src/test/java/com/company/data/MyDeclarable.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.*;
 /**
  * A <code>Declarable</code> object
  *
- * @since 3.2.1
+ * @since GemFire 3.2.1
  */
 public class MyDeclarable implements Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/data/MySizer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/data/MySizer.java b/geode-core/src/test/java/com/company/data/MySizer.java
index 6f624f3..a4ca67d 100644
--- a/geode-core/src/test/java/com/company/data/MySizer.java
+++ b/geode-core/src/test/java/com/company/data/MySizer.java
@@ -18,7 +18,7 @@ package com.company.data;
 /**
  * A <code>Declarable</code> <code>ObjectSizer</code> for used for XML testing
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/company/data/MyTransactionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/company/data/MyTransactionListener.java b/geode-core/src/test/java/com/company/data/MyTransactionListener.java
index 6d57e38..15e103b 100644
--- a/geode-core/src/test/java/com/company/data/MyTransactionListener.java
+++ b/geode-core/src/test/java/com/company/data/MyTransactionListener.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.*;
 /**
  * A <code>TransactionListener</code> that is <code>Declarable</code>
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class MyTransactionListener implements TransactionListener, Declarable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/examples/LinkNode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/examples/LinkNode.java b/geode-core/src/test/java/com/examples/LinkNode.java
index 29a3aee..97a0438 100644
--- a/geode-core/src/test/java/com/examples/LinkNode.java
+++ b/geode-core/src/test/java/com/examples/LinkNode.java
@@ -22,7 +22,7 @@ package com.examples;
  * correctly. 
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class LinkNode {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/examples/SuperClass.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/examples/SuperClass.java b/geode-core/src/test/java/com/examples/SuperClass.java
index 7b99ad5..6c6076f 100644
--- a/geode-core/src/test/java/com/examples/SuperClass.java
+++ b/geode-core/src/test/java/com/examples/SuperClass.java
@@ -23,7 +23,7 @@ import java.util.*;
  * <code>Serializable</code>. 
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class SuperClass {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/examples/TestObject.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/examples/TestObject.java b/geode-core/src/test/java/com/examples/TestObject.java
index fb72dec..a447b63 100644
--- a/geode-core/src/test/java/com/examples/TestObject.java
+++ b/geode-core/src/test/java/com/examples/TestObject.java
@@ -23,7 +23,7 @@ package com.examples;
  * that must be in a non-<code>com.gemstone</code> package.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class TestObject {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
index 65541c8..280f54f 100644
--- a/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
+++ b/geode-core/src/test/java/com/examples/ds/PutDataSerializables.java
@@ -26,7 +26,7 @@ import java.util.Properties;
  * and {@link com.gemstone.gemfire.Instantiator}s into a cache {@link Region}.  
  * Among other things, this is used to test bug 31573.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class PutDataSerializables {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
index 11aa2fd..2944d8e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
@@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category;
  * Tests the functionality of the {@link CopyHelper#copy} method
  * and the builtin copy-on-get Cache functions.
  *
- * @since 4.0
+ * @since GemFire 4.0
  *
  */
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/DeltaTestImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DeltaTestImpl.java b/geode-core/src/test/java/com/gemstone/gemfire/DeltaTestImpl.java
index 6356ab8..602c71c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/DeltaTestImpl.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DeltaTestImpl.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegionLocalMaxMemoryDUnitT
 /**
  * Sample test class which implements Delta.
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class DeltaTestImpl implements DataSerializable, Delta {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
index 0ee17c5..ad56bab 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
@@ -40,7 +40,7 @@ import org.junit.runners.MethodSorters;
 /**
  * Ensure that the ignoreJTA Region setting works
  *
- * @since 4.1.1
+ * @since GemFire 4.1.1
  */
 @SuppressWarnings("deprecation")
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
index 30dacd1..6863f92 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Tests transaction expiration functionality
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 @Category(IntegrationTest.class)
 public class TXExpiryJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
index acdba69..ec7a020 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
@@ -104,7 +104,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 /**
  * Tests basic transaction functionality
  *
- * @since 4.0
+ * @since GemFire 4.0
  *
  */
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/UnitTestDoclet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/UnitTestDoclet.java b/geode-core/src/test/java/com/gemstone/gemfire/UnitTestDoclet.java
index e238e32..1d7aa84 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/UnitTestDoclet.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/UnitTestDoclet.java
@@ -37,7 +37,7 @@ import perffmwk.Formatter;
  * @see com.sun.javadoc.Doclet
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class UnitTestDoclet {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
index 26d1a22..407b075 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * Tests {@link com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl}.
  *
  * @created   August 30, 2004
- * @since     3.5
+ * @since GemFire     3.5
  */
 @SuppressWarnings("deprecation")
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluatorJUnitTest.java
index bd6ce09..34664dd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/CacheHealthEvaluatorJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.rules.TestName;
  * Contains simple tests for the {@link CacheHealthEvaluator}
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 @SuppressWarnings("deprecation")
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
index 8dae015..8322959 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 /**
  * Provides common setUp and tearDown for testing the Admin API.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public abstract class DistributedSystemTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
index 0c44e08..3e5a452 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
@@ -30,7 +30,7 @@ import org.junit.Before;
  * evaluator} classes.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public abstract class HealthEvaluatorTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluatorJUnitTest.java
index 60d0a3a..6791dcc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/MemberHealthEvaluatorJUnitTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * Contains simple tests for the {@link MemberHealthEvaluator}.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 @SuppressWarnings("deprecation")
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/AttributesFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/AttributesFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/AttributesFactoryJUnitTest.java
index 69f0092..cacff93 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/AttributesFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/AttributesFactoryJUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests the functionality of the {@link AttributesFactory} class.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @Category(UnitTest.class)
 public class AttributesFactoryJUnitTest {
@@ -318,7 +318,7 @@ public class AttributesFactoryJUnitTest {
 
   /**
    * Tests the cacheListener functionality
-   * @since 5.0
+   * @since GemFire 5.0
    */
   @Test
   public void testCacheListeners() {
@@ -389,7 +389,7 @@ public class AttributesFactoryJUnitTest {
   }
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   @Test
   public void testConnectionPool() {
@@ -414,7 +414,7 @@ public class AttributesFactoryJUnitTest {
   
  /**
    * Trivial cache listener impl
-   * @since 5.0
+   * @since GemFire 5.0
    */
   private static class MyCacheListener extends CacheListenerAdapter {
     // empty impl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
index 00ad6bc..7d2d8ad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
  * NOTE: these tests using a loner DistributedSystem and local scope regions
  *   so all the listener features tested are for local listeners being invoked
  *   for local operations.
- * @since 5.0
+ * @since GemFire 5.0
  */
 @Category(IntegrationTest.class)
 public class CacheListenerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
index 23c9439..b72734b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java
@@ -155,7 +155,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Create a bridge server on the given port without starting it.
    *
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   protected void createBridgeServer(int port) throws IOException {
     CacheServer bridge = getCache().addCacheServer();
@@ -169,7 +169,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   protected void startBridgeServer(int port)
     throws IOException {
@@ -198,7 +198,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * By default return 0 which turns off selector and gives thread per cnx.
    * Test subclasses can override to run with selector.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected int getMaxThreads() {
     return 0;
@@ -207,7 +207,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Stops the bridge server that serves up the given cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   void stopBridgeServer(Cache cache) {
     CacheServer bridge =
@@ -872,7 +872,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests the basic operations of the {@link Pool}
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test006Pool() throws CacheException {
     final String name = this.getName();
@@ -1471,7 +1471,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests the create operation of the {@link Pool}
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test011PoolCreate() throws CacheException {
     final String name = this.getName();
@@ -1553,7 +1553,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests the put operation of the {@link Pool}
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test012PoolPut() throws CacheException {
     final String name = this.getName();
@@ -1672,7 +1672,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
     /**
    * Tests the put operation of the {@link Pool}
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test013PoolPutNoDeserialize() throws CacheException {
     final String name = this.getName();
@@ -1792,7 +1792,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests that invalidates and destroys are propagated to {@link Pool}s.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test014InvalidateAndDestroyPropagation() throws CacheException {
     final String name = this.getName();
@@ -1990,7 +1990,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
    * Tests that invalidates and destroys are propagated to {@link Pool}s
    * correctly to DataPolicy.EMPTY + InterestPolicy.ALL
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void test015InvalidateAndDestroyToEmptyAllPropagation() throws CacheException {
     final String name = this.getName();
@@ -2220,7 +2220,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
    * Tests that invalidates and destroys are propagated to {@link Pool}s
    * correctly to DataPolicy.EMPTY + InterestPolicy.CACHE_CONTENT
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void test016InvalidateAndDestroyToEmptyCCPropagation() throws CacheException {
     final String name = this.getName();
@@ -3209,7 +3209,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Creates a "loner" distributed system that has dynamic region creation
    * enabled.
-   * @since 4.3
+   * @since GemFire 4.3
    */
   protected Cache createDynamicRegionCache(String testName, String connectionPoolName) {
     // note that clients use non-persistent dr factories.
@@ -3507,7 +3507,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests the containsKeyOnServer operation of the {@link Pool}
    *
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public void test023ContainsKeyOnServer() throws CacheException {
     final String name = this.getName();
@@ -3604,7 +3604,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
    * <code>null</code> value does the right thing with the {@link
    * Pool}.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void test024CreateNullValue() throws CacheException {
     final String name = this.getName();
@@ -4903,7 +4903,7 @@ public class ConnectionPoolDUnitTest extends CacheTestCase {
   /**
    * Tests the keySetOnServer operation of the {@link Pool}
    *
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public void test031KeySetOnServer() throws CacheException {
     final String name = this.getName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
index 4f0335a..08076be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/FinalStaticArrayShouldNotCauseSegFaultTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * This test and its corrections can be removed after the release of JDK
  * 1.8.0u60 if we choose to not support 1.8.0u20 - 1.8.0u45 inclusive.
  * 
- * @since 8.2
+ * @since GemFire 8.2
  */
 @Category(UnitTest.class)
 public class FinalStaticArrayShouldNotCauseSegFaultTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
index 1262891..7394f0e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * Tests PoolManager
- * @since 5.7
+ * @since GemFire 5.7
  */
 @Category(IntegrationTest.class)
 public class PoolManagerJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
index cb11b6f..ad5695d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Unit test for basic DataPolicy.EMPTY feature.
  * NOTE: these tests using a loner DistributedSystem and local scope regions
- * @since 5.0
+ * @since GemFire 5.0
  */
 @Category(IntegrationTest.class)
 public class ProxyJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
index e49e23a..4a31158 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * Unit test for the RegionFactory class
- * @since 5.0
+ * @since GemFire 5.0
  */
 @Category(IntegrationTest.class)
 public class RegionFactoryJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
index 521dc51..b17e69c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
@@ -57,7 +57,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * Unit test for the ClientCacheFactory class
- * @since 6.5
+ * @since GemFire 6.5
  */
 @FixMethodOrder(NAME_ASCENDING)
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
index 502eccf..91f6741 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  * Unit test for the ClientRegionFactory class
- * @since 6.5
+ * @since GemFire 6.5
  */
 @Category(IntegrationTest.class)
 public class ClientRegionFactoryJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 1c0e411..f5513df 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -45,7 +45,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * client and a server in a Register Interests scenario.
  *
  * @see com.gemstone.gemfire.test.dunit.DistributedTestCase
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
index 165dcd4..4da72be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponseJUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class LocatorStatusResponseJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
index b1cac7a..0c0a4c0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
  * 
  * java -cp geode-dependencies.jar:. -Dgemfire.log-file=system.log -Dgemfire.statistic-archive-file=statsArchive.gfs com.gemstone.gemfire.cache.control.MXMemoryPoolListenerExample  
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class MXMemoryPoolListenerExample implements NotificationListener {
   private AtomicBoolean critical = new AtomicBoolean();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index c6e0568..e5eeba3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -98,7 +98,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
 /**
  * Tests the Heap Memory thresholds of {@link ResourceManager}
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 9216788..f9c8e8a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -89,7 +89,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 /**
  * Tests the Off-Heap Memory thresholds of {@link ResourceManager}
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
   private static final long serialVersionUID = -684231183212051910L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index c8ae1de..b79d695 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Tests remote (client/server) query execution.
  *
- * @since 5.0.1
+ * @since GemFire 5.0.1
  */
 public class QueryUsingPoolDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 9b8ae0c..7f2dce7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -59,7 +59,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Tests remote (client/server) query execution.
  *
- * @since 5.0.1
+ * @since GemFire 5.0.1
  */
 public class RemoteQueryDUnitTest extends CacheTestCase {
 



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
index 27f2bb9..678927d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemotePutMessage.java
@@ -72,7 +72,7 @@ import static com.gemstone.gemfire.internal.cache.DistributedCacheOperation.VALU
  * A Replicate Region update message.  Meant to be sent only to
  * the peer who hosts transactional data.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public final class RemotePutMessage extends RemoteOperationMessageWithDirectReply
   implements NewValueImporter, OldValueImporter {
@@ -1087,7 +1087,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl
 
   /**
    * A processor to capture the value returned by {@link RemotePutMessage}
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static class RemotePutResponse extends RemoteOperationResponse  {
     private volatile boolean returnValue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRegionOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRegionOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRegionOperation.java
index fcf0499..2729156 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRegionOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRegionOperation.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * concurrency control enabled so that region-version-vectors must be used to
  * execute these operations.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
index 01e8d9e..2d5989b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteRemoveAllMessage.java
@@ -65,7 +65,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
  * A Replicate Region removeAll message.  Meant to be sent only to
  * the peer who hosts transactional data.
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectReply
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RoleEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RoleEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RoleEventImpl.java
index 3a82353..b5b03eb 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RoleEventImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RoleEventImpl.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalRole;
  * Implementation of a RoleEvent.  Super class is DataSerializable but
  * this class is probably never on the wire, however, it does support it.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public final class RoleEventImpl extends RegionEventImpl
 implements RoleEvent, DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SendQueueOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SendQueueOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SendQueueOperation.java
index 1fc20ef..5ea926f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SendQueueOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/SendQueueOperation.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.*;
 /**
  * Sends a chunk of queued messages to everyone currently playing a role.
  *
- * @since 5.0
+ * @since GemFire 5.0
  *
  */
 public class SendQueueOperation {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StateFlushOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StateFlushOperation.java
index 947bd4d..8866689 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StateFlushOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StateFlushOperation.java
@@ -97,7 +97,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * complex examples in transaction processing and a more straightforward
  * example in DistributedCacheOperation.
  * 
- * @since 5.0.1
+ * @since GemFire 5.0.1
  */
 public class StateFlushOperation  {
 
@@ -274,7 +274,7 @@ public class StateFlushOperation  {
    * This flushes the ordered messages in flight between members and the gii
    * provider, so we don't miss data when the image is requested.
    * 
-   * @since 5.0.1
+   * @since GemFire 5.0.1
    * @see StateFlushOperation.StateStabilizationMessage
    * @see StateFlushOperation.StateStabilizedMessage
    *
@@ -508,7 +508,7 @@ public class StateFlushOperation  {
    * <p>author bruce
    * @see StateFlushOperation.StateStabilizedMessage
    * @see StateFlushOperation.StateMarkerMessage
-   * @since 5.0.1
+   * @since GemFire 5.0.1
    */
   public static final class StateStabilizationMessage
     extends SerialDistributionMessage  {
@@ -653,7 +653,7 @@ public class StateFlushOperation  {
    * <p>author bruce
    * @see StateFlushOperation.StateMarkerMessage
    * @see StateFlushOperation.StateStabilizationMessage
-   * @since 5.0.1
+   * @since GemFire 5.0.1
    *
    */
   public static final class StateStabilizedMessage extends ReplyMessage {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable.java
index b5add21..4fe3a1e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/StoreAllCachedDeserializable.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.internal.lang.StringUtils;
  * This cache deserializable always keeps its byte[] in serialized form
  * and the object form.
  *
- * @since 5.5 
+ * @since GemFire 5.5
  *
  */
 public class StoreAllCachedDeserializable implements CachedDeserializable, DataSerializableFixedID {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXCommitMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXCommitMessage.java
index 4908e09..c3ff698 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXCommitMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXCommitMessage.java
@@ -80,7 +80,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Released;
 /** TXCommitMessage is the message that contains all the information
  * that needs to be distributed, on commit, to other cache members.
  *
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXCommitMessage extends PooledDistributionMessage implements MembershipListener, MessageWithReply
@@ -183,7 +183,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
   
   /**
    * Create and return an eventId given its offset.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected EventID getEventId(int eventOffset) {
     return new EventID(this.farsideBaseMembershipId,
@@ -1284,7 +1284,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
 
     /**
      * Returns the eventId to use for the give farside entry op.
-     * @since 5.7
+     * @since GemFire 5.7
      */
     private EventID getEventId(FarSideEntryOp entryOp) {
       return this.msg.getEventId(entryOp.eventOffset);
@@ -1440,7 +1440,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
     }
     /**
      * Returns the number of operations this region commit will do
-     * @since 5.0
+     * @since GemFire 5.0
      */
     int getOperationCount() {
       int result = 0;
@@ -1512,7 +1512,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
     
     /**
      * Returns a list of QueuedOperation instances for reliable distribution
-     * @since 5.0
+     * @since GemFire 5.0
      */
     List getOperations() {
       QueuedOperation[] ops = new QueuedOperation[getOperationCount()];
@@ -1592,7 +1592,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
     }
     /**
      * Holds data that describes a tx entry op on the far side.
-     * @since 5.0
+     * @since GemFire 5.0
      */
     public class FarSideEntryOp implements Comparable {
       public Operation op;
@@ -2228,7 +2228,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
   /**
    * Reply processor which collects all CommitReplyExceptions and emits
    * a detailed failure exception if problems occur
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private class CommitReplyProcessor extends ReliableReplyProcessor21 {
     private HashMap msgMap;
@@ -2293,7 +2293,7 @@ public class TXCommitMessage extends PooledDistributionMessage implements Member
 
   /**
    * An Exception that collects many remote CommitExceptions
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static class CommitExceptionCollectingException extends ReplyException {
 private static final long serialVersionUID = 589384721273797822L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
index 2906ff6..2cc6681 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntry.java
@@ -265,7 +265,7 @@ public class TXEntry implements Region.Entry
   }
 
   /**
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public Object setValue(Object arg0)
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
index b6686d4..ccc2fc4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryState.java
@@ -64,7 +64,7 @@ import com.gemstone.gemfire.pdx.PdxSerializationException;
  * those tracked by {@link TXEntryUserAttrState}, to an entry.
  * 
  * 
- * @since 4.0
+ * @since GemFire 4.0
  *  
  */
 public class TXEntryState implements Releasable
@@ -85,12 +85,12 @@ public class TXEntryState implements Releasable
   protected int modSerialNum;
   /**
    * Used to remember the event id to use on the farSide for this entry. See bug 39434.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private int farSideEventOffset = -1;
   /**
    * Used to remember the event id to use on the nearSide for this entry. See bug 39434.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private int nearSideEventOffset = -1;
 
@@ -365,7 +365,7 @@ public class TXEntryState implements Releasable
    * this entry.
    * @param modNum the next modified serial number gotten from TXState
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void updateForWrite(final int modNum)
   {
@@ -375,14 +375,14 @@ public class TXEntryState implements Releasable
 
   /**
    * Returns true if this entry has been written; false if only read
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public boolean isDirty() {
     return DETECT_READ_CONFLICTS || this.dirty;
   }
   /**
    * Return true if entry has an operation.
-   * @since 5.5
+   * @since GemFire 5.5
    */
   public boolean hasOp() {
     return this.op != OP_NULL;
@@ -539,7 +539,7 @@ public class TXEntryState implements Releasable
   /**
    * Returns true if this operation has an event for the tx listener
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   final boolean isOpAnyEvent(LocalRegion r)
   {
@@ -721,7 +721,7 @@ public class TXEntryState implements Releasable
   }
   /**
    * Calculate and return the event offset based on the sequence id on TXState.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private static int generateEventOffset(TXState txState) {
     long seqId = EventID.reserveSequenceId();
@@ -732,7 +732,7 @@ public class TXEntryState implements Releasable
   /**
    * Generate offsets for different eventIds; one for nearside and one for farside
    * for the ops for this entry.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void generateBothEventOffsets(TXState txState) {
     assert this.farSideEventOffset == -1;
@@ -742,7 +742,7 @@ public class TXEntryState implements Releasable
   /**
    * Generate the offset for an eventId that will be used for both a farside and nearside
    * op for this entry.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void generateSharedEventOffset(TXState txState) {
     assert this.farSideEventOffset == -1;
@@ -752,7 +752,7 @@ public class TXEntryState implements Releasable
   /**
    * Generate the offset for an eventId that will be used for the nearside
    * op for this entry. No farside op will be done.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private void generateNearSideOnlyEventOffset(TXState txState) {
     generateNearSideEventOffset(txState);
@@ -776,7 +776,7 @@ public class TXEntryState implements Releasable
   /**
    * Calculate (if farside has not already done so) and return then eventID
    * to use for near side op applications.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private EventID getNearSideEventId(TXState txState) {
     assert this.nearSideEventOffset != -1;
@@ -785,7 +785,7 @@ public class TXEntryState implements Releasable
 
   /**
    * Calculate and return the event offset for this entry's farSide operation.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   void generateEventOffsets(TXState txState) {
     switch (this.op) {
@@ -1951,7 +1951,7 @@ public class TXEntryState implements Releasable
    * @param sendShadowKey
    *          true if wan shadowKey should be sent to peers 7.0.1 and above
    *          
-   * @since 5.0
+   * @since GemFire 5.0
    */
   void toFarSideData(DataOutput out, boolean largeModCount, boolean sendVersionTag, boolean sendShadowKey) throws IOException
   {
@@ -2000,7 +2000,7 @@ public class TXEntryState implements Releasable
    * 
    * @param key
    *          the key for this op
-   * @since 5.0
+   * @since GemFire 5.0
    */
   QueuedOperation toFarSideQueuedOp(Object key)
   {
@@ -2043,7 +2043,7 @@ public class TXEntryState implements Releasable
    * Just like an EntryEventImpl but also has access to TxEntryState to make it
    * Comparable
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public final class TxEntryEventImpl extends EntryEventImpl implements Comparable
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryUserAttrState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryUserAttrState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryUserAttrState.java
index 25d4dd1..d53fce0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryUserAttrState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEntryUserAttrState.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * to an entry user attribute.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXEntryUserAttrState {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEvent.java
index 6bfd26f..b2bd140 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXEvent.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.offheap.Releasable;
 /** <p>The internal implementation of the {@link TransactionEvent} interface
  * 
  *
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXEvent implements TransactionEvent, Releasable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXFarSideCMTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXFarSideCMTracker.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXFarSideCMTracker.java
index e5011a4..90e337d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXFarSideCMTracker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXFarSideCMTracker.java
@@ -66,7 +66,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  *
  * </ol>
  *
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXFarSideCMTracker

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXId.java
index b5faa7a..c5e6822 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXId.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.distributed.internal.membership.*;
  * participants (currently VM in a Distributed System).
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see TXManagerImpl#begin
  * @see com.gemstone.gemfire.cache.CacheTransactionManager#getTransactionId

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXLockRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXLockRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXLockRequest.java
index da55d45..06c7572 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXLockRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXLockRequest.java
@@ -25,7 +25,7 @@ import java.util.*;
  * for a single transaction.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXLockRequest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
index 4b2f904..dd4653c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXManagerImpl.java
@@ -80,7 +80,7 @@ import com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMa
  * transaction logging are handled here 
  * 
  *
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see CacheTransactionManager
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
index 29af5cc..6d997c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionLockRequestImpl.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * for a single region.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXRegionLockRequestImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
index 116edf7..19cbe33 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRegionState.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger;
  * has made to a region.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see TXManagerImpl
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
index bdf6a23..f0eb8d1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRemoteCommitMessage.java
@@ -133,7 +133,7 @@ public class TXRemoteCommitMessage extends TXMessage {
    * remote commit operation: a commit from a stub to the tx host. This is the
    * reply to a {@link TXRemoteCommitMessage}.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final class TXRemoteCommitReplyMessage extends ReplyMessage
    {
@@ -250,7 +250,7 @@ public class TXRemoteCommitMessage extends TXMessage {
    * A processor to capture the value returned by {@link 
    * com.gemstone.gemfire.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage}
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static class RemoteCommitResponse extends RemoteOperationResponse
    {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXReservationMgr.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXReservationMgr.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXReservationMgr.java
index 592c21e..2690419 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXReservationMgr.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXReservationMgr.java
@@ -26,7 +26,7 @@ import java.util.*;
  * for modification by the transaction.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  */
 public class TXReservationMgr {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRmtEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRmtEvent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRmtEvent.java
index a19ce92..3de52fd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRmtEvent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXRmtEvent.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
  * the remote commit code.
  * 
  * 
- * @since 4.0
+ * @since GemFire 4.0
  *  
  */
 public class TXRmtEvent implements TransactionEvent

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
index e610991..0ce049d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXState.java
@@ -70,7 +70,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Retained;
  * basis. It lives on the node where transaction data exists.
  *
  * 
- * @since 4.0
+ * @since GemFire 4.0
  * 
  * @see TXManagerImpl
  */
@@ -863,7 +863,7 @@ public class TXState implements TXStateInterface {
   /**
    * Used to keep track of the region and key associated with a TXEntryState.
    * Also used to sort the entries into the order in which they will be applied.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   static class TXEntryStateWithRegionAndKey implements Comparable {
     public final TXEntryState es;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
index 3fa9351..ffcae4b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXStateInterface.java
@@ -85,7 +85,7 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
 
   /**
    * Return true if mod counts for this transaction can not be represented by a byte
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public boolean needsLargeModCount();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
index 1d5f80e..c4a40f7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * must invoke runSecondRunnable() with another Runnable that invokes
  * afterCompletion behavior. 
  * 
- * @since 6.6
+ * @since GemFire 6.6
  *
  */
 public class TXSynchronizationRunnable implements Runnable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
index 866eaff..ceb98f0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UpdateAttributesProcessor.java
@@ -62,7 +62,7 @@ public class UpdateAttributesProcessor {
   /**
    * If true then sender is telling receiver to remove the sender's profile.
    * No profile exchange is needed in this case.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private boolean removeProfile = false;
   private ReplyProcessor21 processor;
@@ -74,7 +74,7 @@ public class UpdateAttributesProcessor {
 
   /**
    * Creates a new instance of UpdateAttributesProcessor
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public UpdateAttributesProcessor(DistributionAdvisee da, boolean removeProfile) {
     this.advisee = da;
@@ -191,7 +191,7 @@ public class UpdateAttributesProcessor {
      * Registers this processor as a membership listener and
      * returns a set of the current members.
      * @return a Set of the current members
-     * @since 5.7
+     * @since GemFire 5.7
      */
     @Override
     protected Set addListenerAndGetMembers() {
@@ -205,7 +205,7 @@ public class UpdateAttributesProcessor {
     }
     /**
      * Unregisters this processor as a membership listener
-     * @since 5.7
+     * @since GemFire 5.7
      */
     @Override
     protected void removeListener() {
@@ -220,7 +220,7 @@ public class UpdateAttributesProcessor {
      * If this processor being used by controller then return
      * ALL members; otherwise defer to super.
      * @return a Set of the current members
-     * @since 5.7
+     * @since GemFire 5.7
      */
     @Override
     protected Set getDistributionManagerIds() {
@@ -460,7 +460,7 @@ public class UpdateAttributesProcessor {
   }
   /**
    * Used to return multiple profiles
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static class ProfilesReplyMessage extends ReplyMessage {
     Profile[] profiles;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedDiskStoreAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedDiskStoreAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedDiskStoreAttributes.java
index fc0dee7..ea403b0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedDiskStoreAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedDiskStoreAttributes.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.Assert;
  * {@link com.gemstone.gemfire.cache.DiskStoreFactory}.  Its initial usage was to validate
  * when a user set a value which should not be set (for DiskStore).
  * 
- * @since prPersistSprint2
+ * @since GemFire prPersistSprint2
  *
  */
 public class UserSpecifiedDiskStoreAttributes extends DiskStoreAttributes

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedRegionAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedRegionAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedRegionAttributes.java
index 269f891..1a35812 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedRegionAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/UserSpecifiedRegionAttributes.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.Assert;
  * {@link com.gemstone.gemfire.cache.AttributesFactory}.  Its initial usage was to validate
  * when a user set a value which should not be set (for PartitionedRegions).
  * 
- * @since 5.1
+ * @since GemFire 5.1
  *
  */
 public abstract class UserSpecifiedRegionAttributes<K,V> implements RegionAttributes<K,V>
@@ -72,7 +72,7 @@ public abstract class UserSpecifiedRegionAttributes<K,V> implements RegionAttrib
   /**
    * Whether this region has specified a disk store name
    *
-   * @since prPersistSprint2
+   * @since GemFire prPersistSprint2
    */
   private boolean hasDiskStoreName = false;
   private boolean hasDiskSynchronous = false;
@@ -80,20 +80,20 @@ public abstract class UserSpecifiedRegionAttributes<K,V> implements RegionAttrib
   /**
    * Whether this region has publisher explicitly set
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   
   private boolean hasPublisher = false;
   /**
    * Whether this region has enable bridge conflation explicitly set
    *
-   * @since 4.2
+   * @since GemFire 4.2
    */
   private boolean hasEnableSubscriptionConflation = false;
   /**
    * Whether this region has enable async conflation explicitly set
    *
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    */
   private  boolean hasEnableAsyncConflation = false;
   
@@ -104,27 +104,27 @@ public abstract class UserSpecifiedRegionAttributes<K,V> implements RegionAttrib
   /**
    * Whether this region has a client to server connection pool
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   private  boolean hasPoolName = false;
   /**
    * Whether this region has a cloning enabled
    *
-   * @since 6.1
+   * @since GemFire 6.1
    */
   private boolean hasCloningEnabled = false;
   
 /**
    * Whether this region has entry value compression.
    * 
-   * @since 8.0
+   * @since GemFire 8.0
    */
   private boolean hasCompressor = false;
   
   /**
    * Whether this region has enable off-heap memory set.
    * 
-   * @since 9.0
+   * @since Geode 1.0
    */
   private boolean hasOffHeap = false;
   
@@ -441,13 +441,13 @@ public abstract class UserSpecifiedRegionAttributes<K,V> implements RegionAttrib
   /**
    * If set to true then an exception will be thrown at creation
    * time if hasPoolName is not true.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public boolean requiresPoolName = false;
   /**
    * Holds index information. Hoisted up to this class in 7.0
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   private List indexes;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMLRURegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMLRURegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMLRURegionMap.java
index 0ee6a27..8adcb06 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMLRURegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMLRURegionMap.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.lru.*;
  * Internal implementation of {@link RegionMap} for regions stored
  * in normal VM memory that maintain an LRU.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMRegionMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMRegionMap.java
index bf2483e..d5122c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMRegionMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMRegionMap.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal.cache;
  * Internal implementation of {@link RegionMap} for regions stored
  * in normal VM memory.
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntry.java
index 49a4530..817567b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntry.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.internal.cache;
  * Disk -> entries can be on disk 
  * LRU -> entries maintain LRU information
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
index 15878d7..cfd1e2b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java
@@ -134,7 +134,7 @@ public class VMStatsDiskLRURegionEntryHeapIntKey extends VMStatsDiskLRURegionEnt
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
index 02e0ced..12492ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java
@@ -134,7 +134,7 @@ public class VMStatsDiskLRURegionEntryHeapLongKey extends VMStatsDiskLRURegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
index 78fea67..5e2dc46 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java
@@ -134,7 +134,7 @@ public class VMStatsDiskLRURegionEntryHeapObjectKey extends VMStatsDiskLRURegion
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
index 24ff86e..99fe18a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java
@@ -151,7 +151,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey1 extends VMStatsDiskLRURegio
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
index 062f49a..2fa5d34 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java
@@ -163,7 +163,7 @@ public class VMStatsDiskLRURegionEntryHeapStringKey2 extends VMStatsDiskLRURegio
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
index 83ffc79..b92166d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java
@@ -136,7 +136,7 @@ public class VMStatsDiskLRURegionEntryHeapUUIDKey extends VMStatsDiskLRURegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
index 99e9a9e..d3809cf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java
@@ -183,7 +183,7 @@ public class VMStatsDiskLRURegionEntryOffHeapIntKey extends VMStatsDiskLRURegion
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
index d45823c..c100fbb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java
@@ -183,7 +183,7 @@ public class VMStatsDiskLRURegionEntryOffHeapLongKey extends VMStatsDiskLRURegio
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
index 7ea70cf..ea2d9df 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java
@@ -183,7 +183,7 @@ public class VMStatsDiskLRURegionEntryOffHeapObjectKey extends VMStatsDiskLRUReg
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
index a676cfa..84a5349 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java
@@ -200,7 +200,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey1 extends VMStatsDiskLRURe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
index d606df9..6ada0c4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java
@@ -212,7 +212,7 @@ public class VMStatsDiskLRURegionEntryOffHeapStringKey2 extends VMStatsDiskLRURe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
index 07a85f9..7013e68 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java
@@ -185,7 +185,7 @@ public class VMStatsDiskLRURegionEntryOffHeapUUIDKey extends VMStatsDiskLRURegio
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntry.java
index 4de5613..6efa75a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntry.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.cache;
  * Stats -> extra statistics
  * Disk -> entries can be on disk 
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
index 25e6bea..2a2cf72 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java
@@ -117,7 +117,7 @@ public class VMStatsDiskRegionEntryHeapIntKey extends VMStatsDiskRegionEntryHeap
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
index 2a85b45..dd883fa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java
@@ -117,7 +117,7 @@ public class VMStatsDiskRegionEntryHeapLongKey extends VMStatsDiskRegionEntryHea
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
index 32a7c36..dfffd73 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java
@@ -117,7 +117,7 @@ public class VMStatsDiskRegionEntryHeapObjectKey extends VMStatsDiskRegionEntryH
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
index 0752316..3125dc7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java
@@ -134,7 +134,7 @@ public class VMStatsDiskRegionEntryHeapStringKey1 extends VMStatsDiskRegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
index 5ea5eab..34597bc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java
@@ -146,7 +146,7 @@ public class VMStatsDiskRegionEntryHeapStringKey2 extends VMStatsDiskRegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
index c7b81a8..81af4b7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java
@@ -119,7 +119,7 @@ public class VMStatsDiskRegionEntryHeapUUIDKey extends VMStatsDiskRegionEntryHea
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
index b3a38be..11246db 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java
@@ -166,7 +166,7 @@ public class VMStatsDiskRegionEntryOffHeapIntKey extends VMStatsDiskRegionEntryO
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
index e994862..c2ab62e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java
@@ -166,7 +166,7 @@ public class VMStatsDiskRegionEntryOffHeapLongKey extends VMStatsDiskRegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
index 656452c..2de736b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java
@@ -166,7 +166,7 @@ public class VMStatsDiskRegionEntryOffHeapObjectKey extends VMStatsDiskRegionEnt
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
index 3317b62..cbaf957 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java
@@ -183,7 +183,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey1 extends VMStatsDiskRegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
index 94b0a56..8fe0113 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java
@@ -195,7 +195,7 @@ public class VMStatsDiskRegionEntryOffHeapStringKey2 extends VMStatsDiskRegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
index e94fac1..95cf625 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java
@@ -168,7 +168,7 @@ public class VMStatsDiskRegionEntryOffHeapUUIDKey extends VMStatsDiskRegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntry.java
index d008890..0583568 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsLRURegionEntry.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.internal.cache;
  * Stats -> extra statistics
  * LRU -> entries maintain LRU information
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntry.java
index 7951233..25547c3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMStatsRegionEntry.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.internal.cache;
  * VM -> entries stored in VM memory
  * Stats -> extra statistics
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntry.java
index 24a3696..c70774a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntry.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.internal.cache;
  * Disk -> entries can be on disk 
  * LRU -> entries maintain LRU information
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
index d262602..5a5c1e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapIntKey.java
@@ -133,7 +133,7 @@ public class VMThinDiskLRURegionEntryHeapIntKey extends VMThinDiskLRURegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
index decc7f2..aa03151 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapLongKey.java
@@ -133,7 +133,7 @@ public class VMThinDiskLRURegionEntryHeapLongKey extends VMThinDiskLRURegionEntr
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
index 88514dd..a680ec3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapObjectKey.java
@@ -133,7 +133,7 @@ public class VMThinDiskLRURegionEntryHeapObjectKey extends VMThinDiskLRURegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
index 8d3eccf..d685c1b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey1.java
@@ -150,7 +150,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey1 extends VMThinDiskLRURegionE
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
index 1a725a5..ad9c23f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapStringKey2.java
@@ -162,7 +162,7 @@ public class VMThinDiskLRURegionEntryHeapStringKey2 extends VMThinDiskLRURegionE
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
index fdec4e3..3830e3f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryHeapUUIDKey.java
@@ -135,7 +135,7 @@ public class VMThinDiskLRURegionEntryHeapUUIDKey extends VMThinDiskLRURegionEntr
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
index e23bad1..5ff06b8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapIntKey.java
@@ -182,7 +182,7 @@ public class VMThinDiskLRURegionEntryOffHeapIntKey extends VMThinDiskLRURegionEn
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
index 3f8eab7..c6868ea 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapLongKey.java
@@ -182,7 +182,7 @@ public class VMThinDiskLRURegionEntryOffHeapLongKey extends VMThinDiskLRURegionE
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
index 650a55a..6c92d90 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapObjectKey.java
@@ -182,7 +182,7 @@ public class VMThinDiskLRURegionEntryOffHeapObjectKey extends VMThinDiskLRURegio
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
index 0eae566..6a8d955 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey1.java
@@ -199,7 +199,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey1 extends VMThinDiskLRURegi
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
index d7e4231..363852b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapStringKey2.java
@@ -211,7 +211,7 @@ public class VMThinDiskLRURegionEntryOffHeapStringKey2 extends VMThinDiskLRURegi
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
index cb1b4dd..5461e2d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskLRURegionEntryOffHeapUUIDKey.java
@@ -184,7 +184,7 @@ public class VMThinDiskLRURegionEntryOffHeapUUIDKey extends VMThinDiskLRURegionE
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntry.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntry.java
index 74a9326..de8239d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntry.java
@@ -27,7 +27,7 @@ package com.gemstone.gemfire.internal.cache;
  * Thin -> no extra statistics
  * Disk -> entries can be on disk 
  *
- * @since 3.5.1
+ * @since GemFire 3.5.1
  *
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
index b4ae14b..6eb4bb9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapIntKey.java
@@ -115,7 +115,7 @@ public class VMThinDiskRegionEntryHeapIntKey extends VMThinDiskRegionEntryHeap {
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
index 43e7631..970a7e8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapLongKey.java
@@ -115,7 +115,7 @@ public class VMThinDiskRegionEntryHeapLongKey extends VMThinDiskRegionEntryHeap
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
index 4d7cf3a..e154981 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapObjectKey.java
@@ -115,7 +115,7 @@ public class VMThinDiskRegionEntryHeapObjectKey extends VMThinDiskRegionEntryHea
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
index ec46028..7822abf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey1.java
@@ -132,7 +132,7 @@ public class VMThinDiskRegionEntryHeapStringKey1 extends VMThinDiskRegionEntryHe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
index 8cf540d..d627873 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapStringKey2.java
@@ -144,7 +144,7 @@ public class VMThinDiskRegionEntryHeapStringKey2 extends VMThinDiskRegionEntryHe
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
index baaa7df..072ad3c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryHeapUUIDKey.java
@@ -117,7 +117,7 @@ public class VMThinDiskRegionEntryHeapUUIDKey extends VMThinDiskRegionEntryHeap
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
index 1cff740..76d7ad1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapIntKey.java
@@ -164,7 +164,7 @@ public class VMThinDiskRegionEntryOffHeapIntKey extends VMThinDiskRegionEntryOff
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
index 07cf3ae..8d6b5bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapLongKey.java
@@ -164,7 +164,7 @@ public class VMThinDiskRegionEntryOffHeapLongKey extends VMThinDiskRegionEntryOf
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
index a873682..9a3c612 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapObjectKey.java
@@ -164,7 +164,7 @@ public class VMThinDiskRegionEntryOffHeapObjectKey extends VMThinDiskRegionEntry
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
index 3b7d73d..f0f4385 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey1.java
@@ -181,7 +181,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey1 extends VMThinDiskRegionEntr
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
index cf01b54..90ed6a3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapStringKey2.java
@@ -193,7 +193,7 @@ public class VMThinDiskRegionEntryOffHeapStringKey2 extends VMThinDiskRegionEntr
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
index 1469516..942a5e0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/VMThinDiskRegionEntryOffHeapUUIDKey.java
@@ -166,7 +166,7 @@ public class VMThinDiskRegionEntryOffHeapUUIDKey extends VMThinDiskRegionEntryOf
   /**
    * DiskId
    * 
-   * @since 5.1
+   * @since GemFire 5.1
    */
   protected DiskId id;//= new DiskId();
   public DiskId getDiskId() {



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ReadyForEventsOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ReadyForEventsOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ReadyForEventsOp.java
index 71ecdfe..b516fd7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ReadyForEventsOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ReadyForEventsOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 /**
  * Tells the server we are ready to receive server-to-client events
  * from durable subscriptions.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ReadyForEventsOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
index 45229d5..d7a6fa5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInstantiatorsOp.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.util.BlobHelper;
 
 /**
  * Register a bunch of instantiators on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class RegisterInstantiatorsOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestListOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestListOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestListOp.java
index fc9bed1..9497407 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestListOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestListOp.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.tier.MessageType;
 
 /**
  * Does a region registerInterestList on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class RegisterInterestListOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestOp.java
index 78f77b1..b790064 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestOp.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 /**
  * Does a region registerInterest on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class RegisterInterestOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
index 328d3df..5c48ece 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 /**
  * Used to keep track of what interest a client has registered.
  * This code was extracted from the old ConnectionProxyImpl.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class RegisterInterestTracker {
   private static final Logger logger = LogService.getLogger();
@@ -334,7 +334,7 @@ public class RegisterInterestTracker {
    * a client fails over to another server and does register interest based on 
    * this Data structure 
    * 
-   * @since 5.5
+   * @since GemFire 5.5
    *
    */
    static protected class FailoverInterestList {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RemoveAllOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RemoveAllOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RemoveAllOp.java
index 6ba1932..1ab1ed3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RemoveAllOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RemoveAllOp.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 
 /**
  * Does a region removeAll on a server
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class RemoveAllOp {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RollbackOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RollbackOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RollbackOp.java
index 6d60b1b..bdaea85 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RollbackOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RollbackOp.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Does a Rollback on the server
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class RollbackOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerProxy.java
index 8717bd0..137f596 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerProxy.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
 
 /**
  * Used to send operations from a client to a server.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ServerProxy {
   protected final InternalPool pool;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
index 23e04fd..8c6c1d4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerRegionProxy.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 
 /**
  * Used to send region operations from a client to a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 @SuppressWarnings("deprecation")
 public class ServerRegionProxy extends ServerProxy implements ServerRegionDataAccess {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/SizeOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/SizeOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/SizeOp.java
index 64ef40c..170e846 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/SizeOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/SizeOp.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
 
 /**
  * Does a region size on a server
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class SizeOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/TXFailoverOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/TXFailoverOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/TXFailoverOp.java
index cc91cec..0c5628d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/TXFailoverOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/TXFailoverOp.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
  * Indicates to the server that a transaction is
  * failing over to this server. The server then
  * performs the necessary bootstrapping for the tx.
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class TXFailoverOp {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestListOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestListOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestListOp.java
index 5d247f1..b408bf5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestListOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestListOp.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * Does a region unregisterInterestList on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class UnregisterInterestListOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestOp.java
index 510d719..b266e60 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/UnregisterInterestOp.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.tier.InterestType;
 
 /**
  * Does a region unregisterInterest on a server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class UnregisterInterestOp {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusRequest.java
index 3109890..99f9191 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusRequest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.DataSerializableFixedID;
  * </p>
  * @see com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest
  * @see com.gemstone.gemfire.internal.DataSerializableFixedID
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LocatorStatusRequest extends ServerLocationRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponse.java
index ecb82d7..07aaf33 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/LocatorStatusResponse.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.process.ProcessUtils;
  * The LocatorStatusResponse class...
  * </p>
  * @see com.gemstone.gemfire.cache.client.internal.locator.ServerLocationResponse
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class LocatorStatusResponse extends ServerLocationResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManager.java
index 4f0e152..2f25222 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManager.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.distributed.internal.ServerLocation;
  * A pool for managing client to server connections. This interface
  * allows connections to be checked out and checked in, and keeps
  * the number of connections within the min and max boundaries. 
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public interface ConnectionManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
index 0ee36df..f1b3eca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -66,7 +66,7 @@ import org.apache.logging.log4j.Logger;
  * Manages client to server connections for the connection pool. This class contains
  * all of the pooling logic to checkout/checkin connections.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class ConnectionManagerImpl implements ConnectionManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/PooledConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/PooledConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/PooledConnection.java
index d1531d1..7dcbaad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/PooledConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/PooledConnection.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ServerQueueStatus;
 /**
  * A connection managed by the connection manager. Keeps track
  * of the current state of the connection. 
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 class PooledConnection implements Connection {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceFactory.java
index b6e17d8..49ff30c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceFactory.java
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * Factory for defining and starting a {@link RebalanceOperation}.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface RebalanceFactory {
   
@@ -33,7 +33,7 @@ public interface RebalanceFactory {
    * 
    * @param regions
    *          A set containing the names of regions to include.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   RebalanceFactory includeRegions(Set<String> regions);
   
@@ -44,7 +44,7 @@ public interface RebalanceFactory {
    * 
    * @param regions
    *          A set containing the names of regions to exclude.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   RebalanceFactory excludeRegions(Set<String> regions);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
index 38fabed..0051423 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeoutException;
  * Operation for rebalancing resources used by the {@link 
  * com.gemstone.gemfire.cache.Cache}.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface RebalanceOperation {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceResults.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceResults.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceResults.java
index 57dff25..be0d3d2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceResults.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceResults.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.partition.PartitionRebalanceInfo;
 /**
  * The results of rebalancing <code>Cache</code> resources.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface RebalanceResults {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
index 8bd7416..3226b24 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
  * Monitoring of heap utilization is enabled by setting the critical heap
  * percentage using {@link #setCriticalHeapPercentage(float)}.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface ResourceManager {
   
@@ -130,7 +130,7 @@ public interface ResourceManager {
    * <= 100 or when less than the current eviction heap percentage
    * @see #getCriticalHeapPercentage()
    * @see #getEvictionHeapPercentage()
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public void setCriticalHeapPercentage(float heapPercentage);
   
@@ -141,7 +141,7 @@ public interface ResourceManager {
    * @return either the current or recently used percentage of the maximum
    * tenured heap
    * @see #setCriticalHeapPercentage(float)
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public float getCriticalHeapPercentage();
   
@@ -172,7 +172,7 @@ public interface ResourceManager {
    * <= 100 or when less than the current eviction off-heap percentage
    * @see #getCriticalOffHeapPercentage()
    * @see #getEvictionOffHeapPercentage()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public void setCriticalOffHeapPercentage(float offHeapPercentage);
   
@@ -183,7 +183,7 @@ public interface ResourceManager {
    * @return either the current or recently used percentage of the maximum
    * off-heap memory
    * @see #setCriticalOffHeapPercentage(float)
-   * @since 9.0
+   * @since Geode 1.0
    */
   public float getCriticalOffHeapPercentage();
 
@@ -208,7 +208,7 @@ public interface ResourceManager {
    * <= 100 or when greater than the current critical heap percentage.
    * @see #getEvictionHeapPercentage()
    * @see #getCriticalHeapPercentage()
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public void setEvictionHeapPercentage(float heapPercentage);
   
@@ -220,7 +220,7 @@ public interface ResourceManager {
    * @return either the current or recently used percentage of the maximum 
    * tenured heap
    * @see #setEvictionHeapPercentage(float)
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public float getEvictionHeapPercentage();
 
@@ -242,7 +242,7 @@ public interface ResourceManager {
    * <= 100 or when greater than the current critical off-heap percentage.
    * @see #getEvictionOffHeapPercentage()
    * @see #getCriticalOffHeapPercentage()
-   * @since 9.0
+   * @since Geode 1.0
    */
   public void setEvictionOffHeapPercentage(float offHeapPercentage);
   
@@ -254,7 +254,7 @@ public interface ResourceManager {
    * @return either the current or recently used percentage of the maximum 
    * off-heap memory
    * @see #setEvictionOffHeapPercentage(float)
-   * @since 9.0
+   * @since Geode 1.0
    */
   public float getEvictionOffHeapPercentage();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
index a077779..ddb49b3 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
 /**
  * Exception to indicate that Region is empty for data aware functions.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public class EmptyRegionFunctionException extends FunctionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Execution.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Execution.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Execution.java
index 19bfe79..41b1097 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Execution.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Execution.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.LowMemoryException;
  * <p>This interface is implemented by GemFire. To obtain an instance of it use {@link FunctionService}.
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see FunctionService
  * @see Function
@@ -50,7 +50,7 @@ public interface Execution {
    * @throws UnsupportedOperationException
    *           if not called after
    *           {@link FunctionService#onRegion(com.gemstone.gemfire.cache.Region)}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Execution withFilter(Set<?> filter);
 
@@ -60,7 +60,7 @@ public interface Execution {
    * @param args user data passed to the function execution
    * @return an Execution with args 
    * @throws IllegalArgumentException if the input parameter is null
-   * @since 6.0
+   * @since GemFire 6.0
    *                 
    */
   public Execution withArgs(Object args);
@@ -72,7 +72,7 @@ public interface Execution {
    * @return an Execution with a collector
    * @throws IllegalArgumentException if {@link ResultCollector} is null
    * @see ResultCollector
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Execution withCollector(
       ResultCollector<?, ?> rc);
@@ -94,7 +94,7 @@ public interface Execution {
    *         {@link Execution#withCollector(ResultCollector)}. User has to use
    *         this reference to retrieve results.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ResultCollector<?, ?> execute(
       String functionId) throws FunctionException;
@@ -115,7 +115,7 @@ public interface Execution {
    *         {@link Execution#withCollector(ResultCollector)}. User has to use
    *         this reference to retrieve results.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public ResultCollector<?, ?> execute(
       Function function) throws FunctionException;
@@ -143,7 +143,7 @@ public interface Execution {
    *         {@link Execution#withCollector(ResultCollector)}. User has to use
    *         this reference to retrieve results.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @deprecated as of 6.6, use {@link #execute(String)} instead
    */
   @Deprecated
@@ -176,7 +176,7 @@ public interface Execution {
    *         {@link Execution#withCollector(ResultCollector)}. User has to use
    *         this reference to retrieve results.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @deprecated as of 6.6, use {@link #execute(String)} instead
    */
   @Deprecated
@@ -212,7 +212,7 @@ public interface Execution {
    *         {@link Execution#withCollector(ResultCollector)}. User has to use
    *         this reference to retrieve results.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @deprecated as of 6.6, use {@link #execute(String)} instead
    */
   @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Function.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Function.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Function.java
index f32fcad..79364a9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Function.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/Function.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.lang.Identifiable;
  * @see FunctionService
  *
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 @FunctionalInterface
 public interface Function extends Identifiable<String> {
@@ -52,7 +52,7 @@ public interface Function extends Identifiable<String> {
    * </p>
    * 
    * @return whether this function returns a Result back to the caller.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public default boolean hasResult() {
     return true;
@@ -67,7 +67,7 @@ public interface Function extends Identifiable<String> {
    * provided in parameter is instance of {@link RegionFunctionContext}.
    * 
    * @param context as created by {@link Execution}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public void execute(FunctionContext context);
 
@@ -76,7 +76,7 @@ public interface Function extends Identifiable<String> {
    * with {@link FunctionService}
    * 
    * @return string identifying this function
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public default String getId() {
     return getClass().getCanonicalName();
@@ -96,7 +96,7 @@ public interface Function extends Identifiable<String> {
    * </p>
    *
    * @return false if the function is read only, otherwise returns true
-   * @since 6.0
+   * @since GemFire 6.0
    * @see FunctionService
    */
   public default boolean optimizeForWrite() {
@@ -110,7 +110,7 @@ public interface Function extends Identifiable<String> {
    * @return whether the function is eligible for re-execution.
    * @see RegionFunctionContext#isPossibleDuplicate()
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public default boolean isHA() {
     return true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionAdapter.java
index 674120c..7ee262a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionAdapter.java
@@ -30,7 +30,7 @@ package com.gemstone.gemfire.cache.execute;
  * </ol>
  * </p>
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * @see Function
  * @deprecated Use {@link Function} instead. Function has default
  * methods that now mimic the behavior of FunctionAdapter.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionContext.java
index 932f345..844e4c8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionContext.java
@@ -28,7 +28,7 @@ package com.gemstone.gemfire.cache.execute;
  * in to {@link Function#execute(FunctionContext)}.
  * 
  *
- * @since 6.0
+ * @since GemFire 6.0
  *
  * @see RegionFunctionContext
  *
@@ -40,7 +40,7 @@ public interface FunctionContext {
    * {@link Execution#withArgs(Object)}
    * 
    * @return the arguments or null if there are no arguments
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Object getArguments();
 
@@ -49,7 +49,7 @@ public interface FunctionContext {
    *  
    * @return a unique identifier
    * @see Function#getId()
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public String getFunctionId();
   
@@ -59,7 +59,7 @@ public interface FunctionContext {
    * pieces and send each piece back to the calling thread's ResultCollector.
    * 
    * @return ResultSender
-   * @since 6.0
+   * @since GemFire 6.0
    */
   
   public <T> ResultSender<T> getResultSender();
@@ -71,7 +71,7 @@ public interface FunctionContext {
    * @return a boolean (true) to identify whether it is a re-execute (else
    *         false)
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @see Function#isHA()
    */
   public boolean isPossibleDuplicate();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
index e55b99f..b6f017c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionException.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.Assert;
  * </p>
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * @see FunctionService
  */
 public class FunctionException extends GemFireException {
@@ -54,7 +54,7 @@ public class FunctionException extends GemFireException {
   /**
    * Creates new function exception with given error message.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public FunctionException() {
   }
@@ -63,7 +63,7 @@ public class FunctionException extends GemFireException {
    * Creates new function exception with given error message.
    * 
    * @param msg
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public FunctionException(String msg) {
     super(msg);
@@ -75,7 +75,7 @@ public class FunctionException extends GemFireException {
    * 
    * @param msg
    * @param cause
-   * @since 6.0 
+   * @since GemFire 6.0
    */
   public FunctionException(String msg, Throwable cause) {
     super(msg, cause);
@@ -86,7 +86,7 @@ public class FunctionException extends GemFireException {
    * error message.
    * 
    * @param cause
-   * @since 6.0 
+   * @since GemFire 6.0
    */
   public FunctionException(Throwable cause) {
     super(cause);
@@ -96,7 +96,7 @@ public class FunctionException extends GemFireException {
    * Adds exceptions thrown from different nodes to a ds
    * 
    * @param cause
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final void addException(Throwable cause) {
     Assert.assertTrue(cause != null,
@@ -107,7 +107,7 @@ public class FunctionException extends GemFireException {
   /**
    * Returns the list of exceptions thrown from different nodes
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final List<Throwable> getExceptions() {
     if (this.exceptions == null) {
@@ -119,7 +119,7 @@ public class FunctionException extends GemFireException {
   /**
    * Adds the list of exceptions provided
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final void addExceptions(Collection<? extends Throwable> ex) {
     getExceptions().addAll(ex);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
index f95a86d..392db12 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * Function needs to be re-executed if the
  * {@link FunctionException#getCause()} is FunctionInvocationTargetException.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public class FunctionInvocationTargetException extends FunctionException {
@@ -50,7 +50,7 @@ public class FunctionInvocationTargetException extends FunctionException {
    *                the error message
    * @param id
    *                the DistributedMember id of the source
-   * @since 6.5
+   * @since GemFire 6.5
    * 
    */
   public FunctionInvocationTargetException(String msg, DistributedMember id) {
@@ -83,7 +83,7 @@ public class FunctionInvocationTargetException extends FunctionException {
    * Method to get the member id of the Exception
    * 
    * @return DistributedMember id
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public DistributedMember getMemberId() {
     return this.id;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionService.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionService.java
index bb547b0..4ae2e72 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/FunctionService.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * generically to peers in a {@link DistributedSystem} or servers in a {@link Pool}.  
  * </p>
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public final class FunctionService {
   private static final FunctionServiceManager functionSvcMgr= new FunctionServiceManager();
@@ -69,7 +69,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if the region passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Execution onRegion(Region region) {
     return functionSvcMgr.onRegion(region);
@@ -87,7 +87,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if Pool instance passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Execution onServer(Pool pool) {
     return functionSvcMgr.onServer(pool);
@@ -104,7 +104,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if Pool instance passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Execution onServers(Pool pool) {
     return functionSvcMgr.onServers(pool);
@@ -123,7 +123,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if cache is null, is not on a client, or it does not have a default pool
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static Execution onServer(RegionService regionService) {
     return functionSvcMgr.onServer(regionService);
@@ -141,7 +141,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if cache is null, is not on a client, or it does not have a default pool
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static Execution onServers(RegionService regionService) {
     return functionSvcMgr.onServers(regionService);
@@ -162,7 +162,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *                 if either input parameter is null
-   * @since 6.0
+   * @since GemFire 6.0
    * @deprecated use {@link #onMember(DistributedMember)} instead
    */
   public static Execution onMember(DistributedSystem system,
@@ -182,7 +182,7 @@ public final class FunctionService {
    * 
    * @throws FunctionException
    *                 if DistributedSystem instance passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    * @deprecated use {@link #onMember(String...)} instead
    */
   public static Execution onMembers(DistributedSystem system) {
@@ -202,7 +202,7 @@ public final class FunctionService {
    *                executed
    * @throws FunctionException
    *                 if DistributedSystem instance passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    * @deprecated use {@link #onMembers(Set)} instead
    */
   public static Execution onMembers(DistributedSystem system,
@@ -222,7 +222,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *           if distributedMember is null
-   * @since 7.0
+   * @since GemFire 7.0
    * 
    */
   public static Execution onMember(DistributedMember distributedMember) {
@@ -247,7 +247,7 @@ public final class FunctionService {
    * 
    * @throws FunctionException
    *           if no members are found belonging to the provided groups
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onMembers(String... groups) {
     return functionSvcMgr.onMembers(getDistributedSystem(), groups);
@@ -264,7 +264,7 @@ public final class FunctionService {
    *          executed
    * @throws FunctionException
    *           if distributedMembers is null
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onMembers(Set<DistributedMember> distributedMembers) {
     return functionSvcMgr.onMembers(getDistributedSystem(), distributedMembers);
@@ -283,7 +283,7 @@ public final class FunctionService {
    * @return Execution
    * @throws FunctionException
    *           if no members are found belonging to the provided groups
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public static Execution onMember(String... groups) {
     return functionSvcMgr.onMember(getDistributedSystem(), groups);
@@ -297,7 +297,7 @@ public final class FunctionService {
    * @return Function
    * @throws FunctionException
    *                 if functionID passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Function getFunction(String functionId) {
     return functionSvcMgr.getFunction(functionId);
@@ -315,7 +315,7 @@ public final class FunctionService {
    * @throws FunctionException
    *                 if function instance passed is null or Function.getId()
    *                 returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static void registerFunction(Function function) {
     functionSvcMgr.registerFunction(function);
@@ -329,7 +329,7 @@ public final class FunctionService {
    * @throws FunctionException
    *                 if function instance passed is null or Function.getId()
    *                 returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static void unregisterFunction(String functionId) {
     functionSvcMgr.unregisterFunction(functionId);
@@ -341,7 +341,7 @@ public final class FunctionService {
    * @throws FunctionException
    *                 if function instance passed is null or Function.getId()
    *                 returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static boolean isRegistered(String functionId) {
     return functionSvcMgr.isRegistered(functionId);
@@ -352,7 +352,7 @@ public final class FunctionService {
    * Returns all locally registered functions
    * @return A view of registered functions as a Map
    *         of {@link Function#getId()} to {@link Function}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static Map<String, Function> getRegisteredFunctions() {
     return functionSvcMgr.getRegisteredFunctions();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/RegionFunctionContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/RegionFunctionContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/RegionFunctionContext.java
index ea6078a..a5f90d9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/RegionFunctionContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/RegionFunctionContext.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
  * </p>
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see FunctionContext
  * @see PartitionRegionHelper
@@ -52,7 +52,7 @@ public interface RegionFunctionContext extends FunctionContext {
    * @see Execution#withFilter(Set)
    * 
    * @return the objects that caused the function to be routed to this cluster member
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public Set<?> getFilter();
 
@@ -63,7 +63,7 @@ public interface RegionFunctionContext extends FunctionContext {
    * 
    * @return returns the Region on which the function is executed
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public <K, V> Region<K, V> getDataSet();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultCollector.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultCollector.java
index 3d2c477..32b7545 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultCollector.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultCollector.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * results in Arraylist. There is no need to provide a synchronization mechanism
  * in the user implementations of ResultCollector
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  */
 public interface ResultCollector<T,S> {
@@ -72,7 +72,7 @@ public interface ResultCollector<T,S> {
    * @return the result
    * @throws FunctionException
    *           if result retrieval fails
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public S getResult() throws FunctionException;
 
@@ -91,7 +91,7 @@ public interface ResultCollector<T,S> {
    *           if result retrieval fails within timeout provided
    * @throws InterruptedException
    *           if the current thread was interrupted while waiting
-   * @since 6.0
+   * @since GemFire 6.0
    * 
    */
   public S getResult(long timeout, TimeUnit unit)
@@ -103,7 +103,7 @@ public interface ResultCollector<T,S> {
    * result is sent using ResultSender.
    * 
    * @param resultOfSingleExecution
-   * @since 6.0
+   * @since GemFire 6.0
    * @param memberID
    *          DistributedMember ID to which result belongs
    */
@@ -117,7 +117,7 @@ public interface ResultCollector<T,S> {
    * {@link ResultSender#lastResult(Object) last result} from all the
    * executing nodes, it keeps waiting for more results to come.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    * 
    * @see ResultSender#lastResult(Object)
    */
@@ -128,7 +128,7 @@ public interface ResultCollector<T,S> {
    * Function Execution HA). This is to clear the previous execution results from
    * the result collector
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void clearResults();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
index 85f2928..ee02258 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
@@ -46,7 +46,7 @@ package com.gemstone.gemfire.cache.execute;
  * </pre>
  * 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  * 
  * @see ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)
  * 
@@ -85,7 +85,7 @@ public interface ResultSender<T> {
    * @param t
    * 
    * @see #lastResult(Object)
-   * @since 6.3
+   * @since GemFire 6.3
    */
   public void sendException(Throwable t);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/internal/FunctionServiceManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/internal/FunctionServiceManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/internal/FunctionServiceManager.java
index 2e76307..3a3e261 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/internal/FunctionServiceManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/execute/internal/FunctionServiceManager.java
@@ -66,7 +66,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * While {@link FunctionService} is a customer facing interface to this functionality, all of the work is done here. In
  * addition, internal only functionality is exposed in this class.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public final class FunctionServiceManager {
   private final static ConcurrentHashMap<String, Function> idToFunctionMap = new ConcurrentHashMap<String, Function>();
@@ -96,7 +96,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if the region passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Execution onRegion(Region region) {
     if (region == null) {
@@ -138,7 +138,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if Pool instance passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Execution onServer(Pool pool, String... groups) {
     if (pool == null) {
@@ -162,7 +162,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if Pool instance passed in is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Execution onServers(Pool pool, String... groups) {
     if (pool == null) {
@@ -188,7 +188,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if cache is null, is not on a client, or it does not have a default pool
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final Execution onServer(RegionService regionService, String... groups) {
     if (regionService == null) {
@@ -220,7 +220,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if cache is null, is not on a client, or it does not have a default pool
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final Execution onServers(RegionService regionService, String... groups) {
     if (regionService == null) {
@@ -254,7 +254,7 @@ public final class FunctionServiceManager {
    * @return Execution
    * @throws FunctionException
    *           if either input parameter is null
-   * @since 6.0
+   * @since GemFire 6.0
    * 
    */
   public final Execution onMember(DistributedSystem system, DistributedMember distributedMember) {
@@ -280,7 +280,7 @@ public final class FunctionServiceManager {
    * 
    * @throws FunctionException
    *           if DistributedSystem instance passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Execution onMembers(DistributedSystem system, String... groups) {
     if (system == null) {
@@ -312,7 +312,7 @@ public final class FunctionServiceManager {
    *          set of distributed members on which {@link Function} to be executed
    * @throws FunctionException
    *           if DistributedSystem instance passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Execution onMembers(DistributedSystem system, Set<DistributedMember> distributedMembers) {
     if (system == null) {
@@ -334,7 +334,7 @@ public final class FunctionServiceManager {
    * @return Function
    * @throws FunctionException
    *           if functionID passed is null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Function getFunction(String functionId) {
     if (functionId == null) {
@@ -352,7 +352,7 @@ public final class FunctionServiceManager {
    * 
    * @throws FunctionException
    *           if function instance passed is null or Function.getId() returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final void registerFunction(Function function) {
     if (function == null) {
@@ -374,7 +374,7 @@ public final class FunctionServiceManager {
    * 
    * @throws FunctionException
    *           if function instance passed is null or Function.getId() returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final void unregisterFunction(String functionId) {
     if (functionId == null) {
@@ -388,7 +388,7 @@ public final class FunctionServiceManager {
    * 
    * @throws FunctionException
    *           if function instance passed is null or Function.getId() returns null
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final boolean isRegistered(String functionId) {
     if (functionId == null) {
@@ -401,7 +401,7 @@ public final class FunctionServiceManager {
    * Returns all locally registered functions
    * 
    * @return A view of registered functions as a Map of {@link Function#getId()} to {@link Function}
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public final Map<String, Function> getRegisteredFunctions() {
     // We have to remove the internal functions before returning the map to the users
@@ -425,7 +425,7 @@ public final class FunctionServiceManager {
   /**
    * @param region
    * @return true if the method is called on a region has a {@link Pool}.
-   * @since 6.0
+   * @since GemFire 6.0
    */
   private final boolean isClientRegion(Region region) {
     LocalRegion localRegion = (LocalRegion) region;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
index 3a29981..1924605 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/CloseCQOperationContext.java
@@ -23,7 +23,7 @@ import java.util.Set;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#CLOSE_CQ} operation for the pre-operation
  * case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class CloseCQOperationContext extends ExecuteCQOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
index 48ae9e5..c00b1a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/DestroyOperationContext.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#DESTROY} region operation having the key
  * object for both the pre-operation case and for post-operation updates.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class DestroyOperationContext extends KeyOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
index b4a0764..a2b8ab2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteCQOperationContext.java
@@ -23,7 +23,7 @@ import java.util.Set;
  * Encapsulates a continuous query registeration operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class ExecuteCQOperationContext extends QueryOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
index e6bd455..dafc5c0 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/ExecuteFunctionOperationContext.java
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * OperationContext for Function execution operation. This is for the pre-operation case
  * 
- * @since 6.0
+ * @since GemFire 6.0
  *
  */
 public class ExecuteFunctionOperationContext extends OperationContext {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
index a8de1a9..abec6b6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetDurableCQsOperationContext.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#GET_DURABLE_CQS} operation for the pre-operation
  * case.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class GetDurableCQsOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
index 43b9e3a..f276d2c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/GetOperationContext.java
@@ -23,7 +23,7 @@ package com.gemstone.gemfire.cache.operations;
  * object for the pre-operation case and both key, value objects for the
  * post-operation case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class GetOperationContext extends KeyValueOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
index 7963255..18aff9e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.operations;
 /**
  * Encapsulates registration/unregistration of interest in a region.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class InterestOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestType.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestType.java
index aaa4627..906125d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestType.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.cache.operations;
 /**
  * Enumeration for various interest types supported by GemFire.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public final class InterestType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
index 75b0c37..dd8ce38 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InvalidateOperationContext.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#INVALIDATE} region operation having the key
  * object for both the pre-operation case and for post-operation updates.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class InvalidateOperationContext extends KeyOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
index 71430af..985af0b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyOperationContext.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.operations;
  * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#DESTROY} 
  * and {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#CONTAINS_KEY}.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class KeyOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
index 5c0eeb9..0b8bccc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeySetOperationContext.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#KEY_SET} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class KeySetOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
index 7f7ab8c..415f842 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/KeyValueOperationContext.java
@@ -26,13 +26,13 @@ import com.gemstone.gemfire.internal.cache.EntryEventImpl;
  * Encapsulates a region operation that requires both key and serialized value
  * for the pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class KeyValueOperationContext extends KeyOperationContext {
 
   /**
    * The value of the create/update operation.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   private Object value;
   
@@ -52,7 +52,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
    * @param isObject
    *                true when the value is an object; false when it is a raw
    *                byte array
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public KeyValueOperationContext(Object key, Object value,
       boolean isObject) {
@@ -74,7 +74,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
    *                byte array
    * @param postOperation
    *                true if the context is at the time of sending updates
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public KeyValueOperationContext(Object key, Object value,
       boolean isObject, boolean postOperation) {
@@ -128,7 +128,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
    * or you can just call {@link #getDeserializedValue()}.
    * 
    * @return the value for this operation
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public Object getValue() {
     return this.value;
@@ -166,7 +166,7 @@ public abstract class KeyValueOperationContext extends KeyOperationContext {
    * @param isObject
    *                true when the value is an object (either serialized or
    *                deserialized); false when it is a raw byte array
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setValue(Object value, boolean isObject) {
     this.value = value;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
index 317fee6..20b528c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
@@ -28,7 +28,7 @@ import org.apache.shiro.authz.permission.WildcardPermission;
  *
  * Implementations of this interface are <b>not</b> expected to be thread-safe.
  *
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class OperationContext extends WildcardPermission{
   public static String ALL_REGIONS="*";
@@ -121,7 +121,7 @@ public abstract class OperationContext extends WildcardPermission{
      *
      * @return true if this is a region removeAll operation.
      * @deprecated Use {@code getOperationCode() == REMOVEALL} instead
-     * @since 8.1
+     * @since GemFire 8.1
      */
     @Deprecated
     public boolean isRemoveAll() {
@@ -327,7 +327,7 @@ public abstract class OperationContext extends WildcardPermission{
    * <code>isInvalidate()</code>, <code>isRegionCreate()</code>, <code>isRegionClear()</code>, <code>isRegionDestroy()</code>.
    * Otherwise, returns false.
    *
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public boolean isClientUpdate() {
     if (isPostOperation()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
index aff4496..d8acba9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutAllOperationContext.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.operations.internal.UpdateOnlyMap;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#PUTALL} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class PutAllOperationContext extends OperationContext {
 
@@ -114,7 +114,7 @@ public class PutAllOperationContext extends OperationContext {
    * Get the callback argument object for this operation.
    * 
    * @return the callback argument object for this operation.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public Object getCallbackArg() {
     return this.callbackArg;
@@ -125,7 +125,7 @@ public class PutAllOperationContext extends OperationContext {
    * 
    * @param callbackArg
    *                the callback argument object for this operation.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public void setCallbackArg(Object callbackArg) {
     this.callbackArg = callbackArg;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
index 867c256..de24fd1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/PutOperationContext.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.Region;
  * and value objects for for both the pre-operation case and for post-operation
  * updates.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class PutOperationContext extends KeyValueOperationContext {
 
@@ -61,7 +61,7 @@ public class PutOperationContext extends KeyValueOperationContext {
    * @param isObject
    *                true when the value is an object; false when it is a raw
    *                byte array
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PutOperationContext(Object key,Object value,
       boolean isObject) {
@@ -81,7 +81,7 @@ public class PutOperationContext extends KeyValueOperationContext {
    *                byte array
    * @param postOperation
    *                true if the context is at the time of sending updates
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PutOperationContext(Object key, Object value,
       boolean isObject, boolean postOperation) {
@@ -104,7 +104,7 @@ public class PutOperationContext extends KeyValueOperationContext {
    *                unknown
    * @param isPostOperation
    *                true if the context is at the time of sending updates
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public PutOperationContext(Object key, Object value,
       boolean isObject, byte opType, boolean isPostOperation) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
index f9711b7..9113f79 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/QueryOperationContext.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
  * Encapsulates a cache query operation for both the pre-operation and
  * post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class QueryOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
index 370ec6e..f3ac414 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionClearOperationContext.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_CLEAR} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class RegionClearOperationContext extends RegionOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
index 430ed08..4b92ae9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionCreateOperationContext.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_CREATE} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class RegionCreateOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
index d4693d0..b2d19c1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionDestroyOperationContext.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_DESTROY} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class RegionDestroyOperationContext extends RegionOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
index ba199c6..c631a78 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegionOperationContext.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.cache.operations;
  * {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_CLEAR} 
  * and {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGION_DESTROY}.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public abstract class RegionOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
index 4189c31..f5cda63 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RegisterInterestOperationContext.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.InterestResultPolicy;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REGISTER_INTEREST} region operation for
  * the pre-operation case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class RegisterInterestOperationContext extends InterestOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
index ebc3694..c33d85d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/RemoveAllOperationContext.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.operations.OperationContext;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#REMOVEALL} operation for both the
  * pre-operation and post-operation cases.
  * 
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class RemoveAllOperationContext extends OperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
index 1c28f75..eae3ec5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/StopCQOperationContext.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#STOP_CQ} operation for the pre-operation
  * case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class StopCQOperationContext extends ExecuteCQOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
index 078066e..868d455 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/UnregisterInterestOperationContext.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.operations;
  * Encapsulates a {@link com.gemstone.gemfire.cache.operations.OperationContext.OperationCode#UNREGISTER_INTEREST} region operation for
  * the pre-operation case.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class UnregisterInterestOperationContext extends InterestOperationContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListener.java
index e5cd2d7..44696f6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListener.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.cache.Region;
  * 
  *      Note : Please contact support@gemstone.com before using these APIs
  * 
- * @since 6.5
+ * @since GemFire 6.5
  * 
  */
 public interface PartitionListener {
@@ -88,7 +88,7 @@ public interface PartitionListener {
    * 
    * @param bucketId
    *          id of the bucket which became primary
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void afterPrimary(int bucketId);
 
@@ -97,7 +97,7 @@ public interface PartitionListener {
    * 
    * @param region
    *          handle of the region which is created
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void afterRegionCreate(Region<?, ?> region);
 
@@ -110,7 +110,7 @@ public interface PartitionListener {
    *          id of the bucket removed
    * @param keys
    *          keys in the bucket removed
-   * @since 6.6.1
+   * @since GemFire 6.6.1
    */
   public void afterBucketRemoved(int bucketId, Iterable<?> keys);
 
@@ -125,7 +125,7 @@ public interface PartitionListener {
    *          id of the bucket created
    * @param keys
    *          keys in the bucket created
-   * @since 6.6.1
+   * @since GemFire 6.6.1
    */
   public void afterBucketCreated(int bucketId, Iterable<?> keys);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListenerAdapter.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListenerAdapter.java
index b706dad..f10f8ef 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListenerAdapter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionListenerAdapter.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.Region;
  * (dev@geode.incubator.apache.org) before using these APIs.
  *
  * 
- * @since 6.6.2
+ * @since GemFire 6.6.2
  */
 public class PartitionListenerAdapter implements PartitionListener {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionMemberInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionMemberInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionMemberInfo.java
index 88c412a..1057d20 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionMemberInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionMemberInfo.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * <p>
  * This is an immutable snapshot of the details.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface PartitionMemberInfo {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionNotAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionNotAvailableException.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionNotAvailableException.java
index 5a737fd..395e9b4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionNotAvailableException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionNotAvailableException.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.GemFireException;
  * This exception is thrown when for the given fixed partition, datastore
  * (local-max-memory > 0) is not available.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 
 public class PartitionNotAvailableException extends GemFireException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRebalanceInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRebalanceInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRebalanceInfo.java
index c341596..7b5f914 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRebalanceInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/partition/PartitionRebalanceInfo.java
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * The detailed results of rebalancing a partitioned region.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public interface PartitionRebalanceInfo {
   


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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/RegionConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/RegionConfiguration.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/RegionConfiguration.java
index e8d491d..55d2599 100644
--- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/RegionConfiguration.java
+++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/RegionConfiguration.java
@@ -31,7 +31,7 @@ import java.io.InputStream;
  * Class <code>RegionConfiguration</code> encapsulates the configuration attributes for a <code>Region</code> to be
  * created on the server.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 @SuppressWarnings({"serial", "unchecked"})
 public class RegionConfiguration implements DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 478316f..499c3e5 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -100,7 +100,7 @@ import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
  * @see com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase
  * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands
  * @see com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(DistributedTest.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
index 42e7291..22c6947 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 public class LauncherLifecycleCommandsIntegrationTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 0b5cdfb..3d466b9 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.management.internal.cli.commands.LauncherLifecycleCommands
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @SuppressWarnings("unused")
 @Category(UnitTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index cc4e058..c2a4cec 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -83,7 +83,7 @@ import org.springframework.web.client.RestTemplate;
  * @see com.gemstone.gemfire.cache.Region
  * @see com.gemstone.gemfire.pdx.PdxInstance
  * @see com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
- * @since 1.0.0
+ * @since Geode 1.0.0
  */
 //@RunWith(SpringJUnit4ClassRunner.class)
 //@ContextConfiguration

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Customer.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Customer.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Customer.java
index 618e179..c065fbb 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Customer.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Customer.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.lang.ObjectUtils;
 /**
  * The Customer class models a customer entity.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class Customer implements Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Gender.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Gender.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Gender.java
index f3206e3..9cd1cdb 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Gender.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Gender.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.rest.internal.web.controllers;
 /**
  * The Gender enum is a enumeration of genders (sexes).
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 @SuppressWarnings("unused")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetAllEntries.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetAllEntries.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetAllEntries.java
index 33dde17..daa609e 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetAllEntries.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetAllEntries.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
 /**
  * The GetAllEntries is function that will return a map as a result of its execution.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class GetAllEntries implements Function {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetDeliveredOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetDeliveredOrders.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetDeliveredOrders.java
index b84f5bf..beb8d3a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetDeliveredOrders.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetDeliveredOrders.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.cache.query.TypeMismatchException;
 /**
 * The GetDeliveredOrders class is a gemfire function that gives details about delivered orders.
 * <p/>
-* @since 8.0
+* @since GemFire 8.0
 */
 
 public class GetDeliveredOrders  implements Function {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetRegions.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetRegions.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetRegions.java
index 41c173c..6f287c7 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetRegions.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/GetRegions.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
 /**
 * The GetRegions class is an gemfire function that gives data about available regions.
 * <p/>
-* @since 8.0
+* @since GemFire 8.0
 */
 
 public class GetRegions implements Function  {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Item.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Item.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Item.java
index e331206..5f99bbe 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Item.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Item.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.pdx.PdxWriter;
 /**
  * The Item class models item entity in the real world.
  * <p/>
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Order.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Order.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Order.java
index 074e494..062aaf9 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Order.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Order.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.pdx.PdxWriter;
 /**
 * The Order class is an abstraction modeling a order.
 * <p/>
-* @since 8.0
+* @since GemFire 8.0
 */
 
 public class Order implements PdxSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Person.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Person.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Person.java
index cae9bbd..9687f1e 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Person.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/Person.java
@@ -27,7 +27,7 @@ import java.io.Serializable;
 /**
 * The Person class is an abstraction modeling a person.
 * <p/>
-* @since 8.0
+* @since GemFire 8.0
 */
 @SuppressWarnings("unused")
 public class Person implements PdxSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index dc3986b..5c10342 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -37,7 +37,7 @@ import java.util.*;
 /**
  * Dunit Test to validate OnRegion function execution with REST APIs
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 3717074..aa61a17 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -53,7 +53,7 @@ import java.util.*;
 /**
  * Dunit Test containing inter - operations between REST Client and Gemfire cache client
  *
- * @since 8.0
+ * @since GemFire 8.0
  */
 
 public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 7b006d7..a311a26 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -55,7 +55,8 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * @since 8.0
+ * 
+ * @since GemFire 8.0
  */
 public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
index e4049ff..edad9f8 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestTestUtils.java
@@ -36,7 +36,7 @@ import org.springframework.web.util.UriComponentsBuilder;
  * 
  * @see org.springframework.context.ApplicationContext
  * @see org.springframework.data.gemfire.GemfireTemplate
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class RestTestUtils  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java b/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
index b59dde5..03fadb0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
@@ -41,7 +41,7 @@ package com.gemstone.gemfire;
  * </code>
  * 
  * @see CancelException
- * @since 5.1
+ * @since GemFire 5.1
  */
 public abstract class CancelCriterion
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/CancelException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CancelException.java b/geode-core/src/main/java/com/gemstone/gemfire/CancelException.java
index 53f12b5..e896d2f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CancelException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CancelException.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * Abstract root class of all GemFire exceptions representing system
  * cancellation
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 public abstract class CancelException extends CacheRuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/CanonicalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CanonicalInstantiator.java b/geode-core/src/main/java/com/gemstone/gemfire/CanonicalInstantiator.java
index 9f2e57c..8317141 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CanonicalInstantiator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CanonicalInstantiator.java
@@ -33,7 +33,7 @@ import java.io.*;
  * Note that {@link DataSerializer#fromData} is always called on the instance
  * returned from <code>newInstance(DataInput)</code>.
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public abstract class CanonicalInstantiator extends Instantiator {
   /**
@@ -78,7 +78,7 @@ public abstract class CanonicalInstantiator extends Instantiator {
    * @param in the data input that can be read to decide what instance to create.
    * @return the new "empty" instance.
    * @throws IOException if a read from <code>in</code> fails.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public abstract DataSerializable newInstance(DataInput in)
     throws IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/CopyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CopyException.java b/geode-core/src/main/java/com/gemstone/gemfire/CopyException.java
index 2f116a6..5294368 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CopyException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CopyException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire;
  *
  *
  * @see CopyHelper#copy
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CopyException extends GemFireException {
 private static final long serialVersionUID = -1143711608610323585L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/CopyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CopyHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/CopyHelper.java
index 66bc8f0..f3c2a6a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CopyHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CopyHelper.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.pdx.internal.PdxUnreadData;
  * @see com.gemstone.gemfire.cache.Cache#setCopyOnRead
  * @see com.gemstone.gemfire.cache.CacheTransactionManager
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 
 public final class CopyHelper {
@@ -84,7 +84,7 @@ public final class CopyHelper {
    * </ul>
    * @param o the object to check
    * @return true if o is an instance of a well known immutable class.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static boolean isWellKnownImmutableInstance(Object o) {
     if (o instanceof String) {
@@ -134,7 +134,7 @@ public final class CopyHelper {
    * @throws CopyException if copying fails because a class could not
    * be found or could not be serialized.
    * @see #deepCopy(Object)
-   * @since 4.0
+   * @since GemFire 4.0
    */
   @SuppressWarnings("unchecked")
   public static <T> T copy(T o) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/DataSerializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/DataSerializable.java b/geode-core/src/main/java/com/gemstone/gemfire/DataSerializable.java
index 10cfba1..ecbb044 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/DataSerializable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/DataSerializable.java
@@ -80,7 +80,7 @@ import java.io.*;
  * @see DataSerializer
  * @see Instantiator
  *
- * @since 3.5 */
+ * @since GemFire 3.5 */
 public interface DataSerializable extends Serializable {
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/DataSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
index 0be0044..360069a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
@@ -185,7 +185,7 @@ public class CompanySerializer extends DataSerializer {
  * @see #writeObject(Object, DataOutput)
  * @see #readObject
  *
- * @since 3.5 */
+ * @since GemFire 3.5 */
 public abstract class DataSerializer {
   
   private static final Logger logger = LogService.getLogger();
@@ -1001,7 +1001,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeBoolean
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveBoolean(boolean value, DataOutput out)
     throws IOException {
@@ -1022,7 +1022,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readBoolean
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static boolean readPrimitiveBoolean(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1042,7 +1042,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeByte
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveByte(byte value, DataOutput out)
     throws IOException {
@@ -1063,7 +1063,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readByte
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static byte readPrimitiveByte(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1083,7 +1083,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeChar
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveChar(char value, DataOutput out)
     throws IOException {
@@ -1104,7 +1104,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readChar
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static char readPrimitiveChar(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1124,7 +1124,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeShort
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveShort(short value, DataOutput out)
     throws IOException {
@@ -1145,7 +1145,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readShort
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static short readPrimitiveShort(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1166,7 +1166,7 @@ public abstract class DataSerializer {
    *
    * @see DataOutput#writeByte
    * @see DataInput#readUnsignedByte
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writeUnsignedByte(int value, DataOutput out)
     throws IOException {
@@ -1186,7 +1186,7 @@ public abstract class DataSerializer {
    *
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static int readUnsignedByte(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1207,7 +1207,7 @@ public abstract class DataSerializer {
    *
    * @see DataOutput#writeShort
    * @see DataInput#readUnsignedShort
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writeUnsignedShort(int value, DataOutput out)
     throws IOException {
@@ -1227,7 +1227,7 @@ public abstract class DataSerializer {
    *
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static int readUnsignedShort(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1267,7 +1267,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readInt
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static int readPrimitiveInt(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1287,7 +1287,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeLong
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveLong(long value, DataOutput out)
     throws IOException {
@@ -1308,7 +1308,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readLong
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static long readPrimitiveLong(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1328,7 +1328,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeFloat
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveFloat(float value, DataOutput out)
     throws IOException {
@@ -1349,7 +1349,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readFloat
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static float readPrimitiveFloat(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1369,7 +1369,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see DataOutput#writeDouble
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static void writePrimitiveDouble(double value, DataOutput out)
     throws IOException {
@@ -1390,7 +1390,7 @@ public abstract class DataSerializer {
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    * @see DataInput#readDouble
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public static double readPrimitiveDouble(DataInput in) throws IOException {
     InternalDataSerializer.checkIn(in);
@@ -1477,7 +1477,7 @@ public abstract class DataSerializer {
    *         if a problem occurs while writing to <code>out</code>
    *
    * @see #readByteArray
-   * @since 5.0.2
+   * @since GemFire 5.0.2
    */
   public static void writeObjectAsByteArray(Object obj, DataOutput out)
     throws IOException {
@@ -1699,7 +1699,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readCharArray
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeCharArray(char[] array, DataOutput out)
       throws IOException {
@@ -1716,7 +1716,7 @@ public abstract class DataSerializer {
    *         A problem occurs while reading from <code>in</code>
    *
    * @see #writeCharArray
-   * @since 5.7 
+   * @since GemFire 5.7
    */
   public static char[] readCharArray(DataInput in)
     throws IOException {
@@ -1747,7 +1747,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readBooleanArray
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeBooleanArray(boolean[] array, DataOutput out)
     throws IOException {
@@ -1779,7 +1779,7 @@ public abstract class DataSerializer {
    *         A problem occurs while reading from <code>in</code>
    *
    * @see #writeBooleanArray
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static boolean[] readBooleanArray(DataInput in)
     throws IOException {
@@ -2313,7 +2313,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readVector
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeVector(Vector<?> list, DataOutput out)
     throws IOException {
@@ -2347,7 +2347,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeVector
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static <E> Vector<E> readVector(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -2385,7 +2385,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readStack
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeStack(Stack<?> list, DataOutput out)
     throws IOException {
@@ -2419,7 +2419,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeStack
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static <E> Stack<E> readStack(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -2586,7 +2586,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readLinkedHashSet
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeLinkedHashSet(LinkedHashSet<?> set, DataOutput out)
     throws IOException {
@@ -2603,7 +2603,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeLinkedHashSet
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static <E> LinkedHashSet<E> readLinkedHashSet(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -2794,7 +2794,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readConcurrentHashMap
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static void writeConcurrentHashMap(ConcurrentHashMap<?,?> map, DataOutput out)
     throws IOException {
@@ -2832,7 +2832,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeConcurrentHashMap
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static <K,V> ConcurrentHashMap<K,V> readConcurrentHashMap(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -2871,7 +2871,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readHashtable
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeHashtable(Hashtable<?,?> map, DataOutput out)
     throws IOException {
@@ -2906,7 +2906,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeHashtable
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static <K,V> Hashtable<K,V> readHashtable(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -2946,7 +2946,7 @@ public abstract class DataSerializer {
    *         A problem occurs while writing to <code>out</code>
    *
    * @see #readTreeMap
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void writeTreeMap(TreeMap<?,?> map, DataOutput out)
     throws IOException {
@@ -2982,7 +2982,7 @@ public abstract class DataSerializer {
    *         elements cannot be found.
    *
    * @see #writeTreeMap
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static <K,V> TreeMap<K,V> readTreeMap(DataInput in)
     throws IOException, ClassNotFoundException {
@@ -3437,7 +3437,7 @@ public abstract class DataSerializer {
    * For internal use only.
    * Sets the unique <code>eventId</code> of this
    * <code>DataSerializer</code>. 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final void setEventId(Object/*EventID*/ eventId) {
     this.eventId = (EventID)eventId;
@@ -3447,7 +3447,7 @@ public abstract class DataSerializer {
    * For internal use only.
    * Returns the unique <code>eventId</code> of this
    * <code>DataSerializer</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final Object/*EventID*/ getEventId() {
     return this.eventId;
@@ -3457,7 +3457,7 @@ public abstract class DataSerializer {
    * For internal use only.
    * Sets the context of this
    * <code>DataSerializer</code>. 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final void setContext(Object/*ClientProxyMembershipID*/ context) {
     this.context = (ClientProxyMembershipID)context;
@@ -3467,7 +3467,7 @@ public abstract class DataSerializer {
    * For internal use only.
    * Returns the context of this
    * <code>DataSerializer</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public final Object/*ClientProxyMembershipID*/ getContext() {
     return this.context;
@@ -3505,7 +3505,7 @@ public abstract class DataSerializer {
    * Example: <code>DataSerializer.writeEnum(DAY_OF_WEEK.SUN, out);</code>
    * 
    * @see #readEnum(Class, DataInput)
-   * @since 6.5
+   * @since GemFire 6.5
    * @throws IOException
    */
   public static void writeEnum(Enum e, DataOutput out) throws IOException {
@@ -3533,7 +3533,7 @@ public abstract class DataSerializer {
    * Example:
    * <code>DAY_OF_WEEK d = DataSerializer.readEnum(DAY_OF_WEEK.class, in);</code>
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    * @see #writeEnum(Enum, DataOutput)
    * @throws IOException
    *           A problem occurs while writing to <code>out</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/Delta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/Delta.java b/geode-core/src/main/java/com/gemstone/gemfire/Delta.java
index 048003b..d345b58 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/Delta.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/Delta.java
@@ -29,7 +29,7 @@ import java.io.IOException;
  * object. The difference in object state is contained in the {@link DataOutput}
  * and {@link DataInput} parameters.
  * 
- * @since 6.1
+ * @since GemFire 6.1
  * 
  */
 public interface Delta {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/DeltaSerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/DeltaSerializationException.java b/geode-core/src/main/java/com/gemstone/gemfire/DeltaSerializationException.java
index b016c8f..15eb331 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/DeltaSerializationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/DeltaSerializationException.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire;
  * {@link Delta#fromDelta(java.io.DataInput)} or
  * {@link Delta#toDelta(java.io.DataOutput)} in GemFire.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class DeltaSerializationException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/ForcedDisconnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/ForcedDisconnectException.java b/geode-core/src/main/java/com/gemstone/gemfire/ForcedDisconnectException.java
index bf13980..d4ff966 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/ForcedDisconnectException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/ForcedDisconnectException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire;
  * application is removed from the distributed system due to membership
  * constraints such as network partition detection.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ForcedDisconnectException extends CancelException {
 private static final long serialVersionUID = 4977003259880566257L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/GemFireCheckedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/GemFireCheckedException.java b/geode-core/src/main/java/com/gemstone/gemfire/GemFireCheckedException.java
index 117fc28..3f1a4c4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/GemFireCheckedException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/GemFireCheckedException.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire;
  * is reserved for an older class that extends {@link java.lang.RuntimeException}.
  * 
  * @see com.gemstone.gemfire.GemFireException
- * @since 5.1
+ * @since GemFire 5.1
  */
 public abstract class GemFireCheckedException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/GemFireRethrowable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/GemFireRethrowable.java b/geode-core/src/main/java/com/gemstone/gemfire/GemFireRethrowable.java
index 5325a53..82c4092 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/GemFireRethrowable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/GemFireRethrowable.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire;
  * <p> Note: if user code catches this error (or its subclasses) then it <em>must</em>
  * be rethrown.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class GemFireRethrowable extends Error {
   private static final long serialVersionUID = 8349791552668922571L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/Instantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/Instantiator.java b/geode-core/src/main/java/com/gemstone/gemfire/Instantiator.java
index 0a7fd36..7aac081 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/Instantiator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/Instantiator.java
@@ -142,7 +142,7 @@ public class User implements DataSerializable {
  * @see #register(Instantiator)
  * @see #newInstance
  *
- * @since 3.5 */
+ * @since GemFire 3.5 */
 public abstract class Instantiator {
 
   /** The class associated with this instantiator.  Used mainly for

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/InternalGemFireError.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/InternalGemFireError.java b/geode-core/src/main/java/com/gemstone/gemfire/InternalGemFireError.java
index 36762c9..0681bd2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/InternalGemFireError.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/InternalGemFireError.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire;
  * This is similar to {@link AssertionError}, but these errors are always
  * enabled in a GemFire system.
  * 
- * @since 5.5
+ * @since GemFire 5.5
  * @see AssertionError
  */
 public class InternalGemFireError extends Error {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/InvalidDeltaException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/InvalidDeltaException.java b/geode-core/src/main/java/com/gemstone/gemfire/InvalidDeltaException.java
index e063b18..1cc162e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/InvalidDeltaException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/InvalidDeltaException.java
@@ -25,7 +25,7 @@ import java.io.DataInput;
  * {@link Delta#fromDelta(DataInput in)}. GemFire, on encountering this
  * exception distributes the full application object.
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 public class InvalidDeltaException extends GemFireException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/SerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/SerializationException.java b/geode-core/src/main/java/com/gemstone/gemfire/SerializationException.java
index be5a1c5..cfcbae3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/SerializationException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/SerializationException.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.GemFireIOException;
 
 /**
  * An exception indicating that a serialization or deserialization failed.
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class SerializationException extends GemFireIOException {
 private static final long serialVersionUID = 7783018024920098997L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/StatisticDescriptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/StatisticDescriptor.java b/geode-core/src/main/java/com/gemstone/gemfire/StatisticDescriptor.java
index 5f72c75..e812cec 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/StatisticDescriptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/StatisticDescriptor.java
@@ -31,7 +31,7 @@ package com.gemstone.gemfire;
  * <code>StatisticDescriptor</code>s are naturally ordered by their name.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface StatisticDescriptor extends Comparable<StatisticDescriptor> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java b/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
index bde0dfa..d7f45a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/Statistics.java
@@ -47,7 +47,7 @@ package com.gemstone.gemfire;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public interface Statistics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/StatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsFactory.java
index 6726ced..3ef5ba5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsFactory.java
@@ -98,7 +98,7 @@ package com.gemstone.gemfire;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface StatisticsFactory extends StatisticsTypeFactory {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/StatisticsType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsType.java b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsType.java
index 95c9556..a24e0e5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsType.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsType.java
@@ -29,7 +29,7 @@ package com.gemstone.gemfire;
  * {@link StatisticsFactory}.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface StatisticsType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/StatisticsTypeFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsTypeFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsTypeFactory.java
index 70473a6..9b6c546 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/StatisticsTypeFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/StatisticsTypeFactory.java
@@ -86,7 +86,7 @@ import java.io.Reader;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface StatisticsTypeFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java b/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
index 4dc80d9..c221167 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
@@ -185,7 +185,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
           ...
         }
  * </pre>
- * @since 5.1
+ * @since GemFire 5.1
  */
 @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="DM_GC", justification="This class performs System.gc as last ditch effort during out-of-memory condition.") 
 public final class SystemFailure {
@@ -610,7 +610,7 @@ public final class SystemFailure {
    * The default is false, so this monitoring is turned off. This monitoring has been found 
    * to be unreliable in non-Sun VMs when the VM is under stress or behaves in unpredictable ways.
    *
-   * @since 6.5
+   * @since GemFire 6.5
    */
   static final public boolean MONITOR_MEMORY = Boolean.getBoolean(
       "gemfire.SystemFailure.MONITOR_MEMORY");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/ToDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/ToDataException.java b/geode-core/src/main/java/com/gemstone/gemfire/ToDataException.java
index 386f1d5..e131596 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/ToDataException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/ToDataException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire;
  * {@link DataSerializable#toData} throws an exception or if
  * {@link DataSerializer#toData} is called and returns false.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class ToDataException extends SerializationException {
   private static final long serialVersionUID = -2329606027453879918L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
index 95275c8..3cc8926 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
@@ -36,7 +36,7 @@ import java.util.UUID;
  *
  * @see AdminDistributedSystemFactory
  *
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface AdminDistributedSystem {
@@ -274,7 +274,7 @@ public interface AdminDistributedSystem {
    * Does nothing if the listener is already registered. The listeners are called
    * in the order they are registered.
    * @param listener the listener to register.
-    * @since 5.0
+    * @since GemFire 5.0
    */
    public void addCacheListener(SystemMemberCacheListener listener);
 
@@ -282,7 +282,7 @@ public interface AdminDistributedSystem {
     * Unregisters a cache listener. Does nothing if the listener is
     * not registered.
     * @param listener the listener to unregister.
-    * @since 5.0
+    * @since GemFire 5.0
     */
    public void removeCacheListener(SystemMemberCacheListener listener);
 
@@ -291,7 +291,7 @@ public interface AdminDistributedSystem {
    * CacheServerConfig configure} and {@linkplain #start
    * start}.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    * @deprecated as of 5.7 use {@link #addCacheVm} instead.
    */
   @Deprecated
@@ -303,7 +303,7 @@ public interface AdminDistributedSystem {
    * application VMs that host a server cache are not included in the
    * array.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    * @deprecated as of 5.7 use {@link #getCacheVms} instead.
    */
   @Deprecated
@@ -319,7 +319,7 @@ public interface AdminDistributedSystem {
    * @return array of CacheServer(s) having the queue for the durable client
    * @throws AdminException
    *
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public CacheServer[] getCacheServers(String durableClientId)
       throws AdminException;
@@ -329,7 +329,7 @@ public interface AdminDistributedSystem {
    * CacheVmConfig configure} and {@linkplain #start
    * start}.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheVm addCacheVm() throws AdminException;
 
@@ -339,7 +339,7 @@ public interface AdminDistributedSystem {
    * application VMs that host a server cache are not included in the
    * array.
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheVm[] getCacheVms() throws AdminException;
 
@@ -349,7 +349,7 @@ public interface AdminDistributedSystem {
    *
    * @param distributedMember the distributed member to lookup
    * @return administrative SystemMember for that distributed member
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public SystemMember lookupSystemMember(DistributedMember distributedMember) 
   throws AdminException;
@@ -365,7 +365,7 @@ public interface AdminDistributedSystem {
    *          The host of the member whose files were lost.
    * @param directory
    *          The directory where those files resided.
-   * @since 6.5
+   * @since GemFire 6.5
    * @deprecated use {@link #revokePersistentMember(UUID)} instead
    */
   public void revokePersistentMember(InetAddress host, String directory) throws AdminException;
@@ -381,7 +381,7 @@ public interface AdminDistributedSystem {
    *          The unique id of the disk store which you are revoking. The unique
    *          id can be discovered from {@link #getMissingPersistentMembers()}
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public void revokePersistentMember(UUID diskStoreID) throws AdminException;
   
@@ -391,7 +391,7 @@ public interface AdminDistributedSystem {
    * @return The persistent members that were known to the existing persistent members,
    * when the existing members were last online.
    * @throws AdminException
-   * @since 6.5
+   * @since GemFire 6.5
    * 
    */
   public Set<PersistentID> getMissingPersistentMembers() throws AdminException;
@@ -409,7 +409,7 @@ public interface AdminDistributedSystem {
    *  
    * This is equivalent to calling shutDownAllMembers(0);
    * @return The set of members that were shutdown
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public Set<DistributedMember> shutDownAllMembers() throws AdminException;
   
@@ -429,7 +429,7 @@ public interface AdminDistributedSystem {
    *          complete. 
    * @return The set of members that were shutdown, or null if the timeout is exceeded.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public Set<DistributedMember> shutDownAllMembers(long timeout) throws AdminException;
 
@@ -442,7 +442,7 @@ public interface AdminDistributedSystem {
    * @return The status of the backup, which includes the set of members
    * that were backed up and the set of members that were known to be
    * offline at the time of backup.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public BackupStatus backupAllMembers(File targetDir) throws AdminException;
   
@@ -459,7 +459,7 @@ public interface AdminDistributedSystem {
    * @return The status of the backup, which includes the set of members
    * that were backed up and the set of members that were known to be
    * offline at the time of backup.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public BackupStatus backupAllMembers(File targetDir,File baselineDir) throws AdminException;
   
@@ -470,7 +470,7 @@ public interface AdminDistributedSystem {
    * This is equivalent to calling {DiskStore#forceCompaction} on all members.
    * 
    * @return The set of members that compacted their disk stores.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public Map<DistributedMember, Set<PersistentID>> compactAllDiskStores() throws AdminException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
index 10a94df..4416e42 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
@@ -32,7 +32,7 @@ import java.util.Properties;
 /**
  * Factory for creating GemFire administration entities. 
  *
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class AdminDistributedSystemFactory {
@@ -92,7 +92,7 @@ public class AdminDistributedSystemFactory {
    * @throws IllegalStateException if a {@link DistributedSystem}
    * or {@link AdminDistributedSystem} connection already exists.
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static void setEnableAdministrationOnly(boolean adminOnly) {
     InternalDistributedSystem.setEnableAdministrationOnly(adminOnly);
@@ -116,7 +116,7 @@ public class AdminDistributedSystemFactory {
    *        {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND
    *        default} will be used.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static DistributedSystemConfig
     defineDistributedSystem(DistributedSystem system,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminException.java
index 6193862..cc15b4f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminException.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  * An <code>AdminException</code> is thrown when administration or monitoring
  * of GemFire fails. 
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminXmlException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminXmlException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminXmlException.java
index 2dda191..672c494 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminXmlException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminXmlException.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see DistributedSystemConfig#getEntityConfigXMLFile
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class AdminXmlException extends RuntimeAdminException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/Alert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/Alert.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/Alert.java
index 1266986..cf163a2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/Alert.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/Alert.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  * com.gemstone.gemfire.i18n.LogWriterI18n log message}.
  *
  * @see       AlertListener
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface Alert {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/AlertLevel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AlertLevel.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AlertLevel.java
index 787701e..dec3e9d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AlertLevel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AlertLevel.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * Type-safe enumeration for {@link com.gemstone.gemfire.admin.Alert
  * Alert} level.
  *
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class AlertLevel 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/BackupStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/BackupStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/BackupStatus.java
index 9f8d836..6cd7fa4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/BackupStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/BackupStatus.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
  * The status of a backup operation, returned by
  * {@link AdminDistributedSystem#backupAllMembers(java.io.File,java.io.File)}.
  * 
- * @since 6.5 
+ * @since GemFire 6.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface BackupStatus {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheDoesNotExistException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheDoesNotExistException.java
index 70262ac..8964d79 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheDoesNotExistException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheDoesNotExistException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  * An <code>CacheDoesNotExistException</code> is thrown when an attempt
  * is made to get a cache and one does not exist.
  *
- * @since     3.5
+ * @since GemFire     3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class CacheDoesNotExistException extends AdminException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheHealthConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheHealthConfig.java
index da9547d..11899b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheHealthConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheHealthConfig.java
@@ -63,7 +63,7 @@ package com.gemstone.gemfire.admin;
  * </UL>
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  * */
 public interface CacheHealthConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServer.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServer.java
index 180148a..e94402d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServer.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.admin;
  * A dedicated cache server VM that is managed by the administration
  * API.
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 5.7 use {@link CacheVm} instead.
  */
 @Deprecated
@@ -38,7 +38,7 @@ public interface CacheServer extends SystemMember, ManagedEntity {
    *                durable-id of the client
    * @return true if the server is primary for given client
    * 
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean isPrimaryForDurableClient(String durableClientId);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServerConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServerConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServerConfig.java
index 96a8bdb..16a402c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServerConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheServerConfig.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see AdminDistributedSystem#addCacheServer()
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 5.7 use {@link CacheVmConfig} instead.
  */
 @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVm.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVm.java
index 5ce6786..6d7e482 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVm.java
@@ -26,7 +26,7 @@ package com.gemstone.gemfire.admin;
  * {@link com.gemstone.gemfire.cache.server.CacheServer}
  * but is an instance of this interface.
  *
- * @since 5.7
+ * @since GemFire 5.7
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface CacheVm extends SystemMember, ManagedEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVmConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVmConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVmConfig.java
index 6895672..e5d22de 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVmConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/CacheVmConfig.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see AdminDistributedSystem#addCacheVm()
  *
- * @since 5.7
+ * @since GemFire 5.7
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface CacheVmConfig extends ManagedEntityConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/ConfigurationParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/ConfigurationParameter.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/ConfigurationParameter.java
index d1af87d..dd62026 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/ConfigurationParameter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/ConfigurationParameter.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.admin;
 /**
 * A single configuration parameter of a {@link SystemMember}.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 83aa65d..5131f3c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -55,7 +55,7 @@ import java.util.Properties;
  * <code>DistributedSystemConfig</code> object can be made by invoking
  * the {@link #clone} method.
  *
- * @since 3.5 
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
 */
 public interface DistributedSystemConfig extends Cloneable {
@@ -109,7 +109,7 @@ public interface DistributedSystemConfig extends Cloneable {
       InetAddressUtil.toString(DistributionConfig.DEFAULT_MCAST_ADDRESS);
   
   /** The name of the "membership-port-range" property
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final String MEMBERSHIP_PORT_RANGE_NAME = 
     DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME;
@@ -117,18 +117,18 @@ public interface DistributedSystemConfig extends Cloneable {
   /**
    * The default membership-port-range.
    * <p> Actual value is <code>[1024,65535]</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final int[] DEFAULT_MEMBERSHIP_PORT_RANGE = 
     DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
   
   /** settings for tcp-port
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final String TCP_PORT_NAME = DistributionConfig.TCP_PORT_NAME;
   /** The default value of the "tcpPort" property.
    * <p> Actual value is <code>0</code>.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
 
@@ -311,7 +311,7 @@ public interface DistributedSystemConfig extends Cloneable {
    * <code>DistributedSystem</code>.  The XML file must conform to a
    * <a href="doc-files/ds5_0.dtd">dtd</a>.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public String getEntityConfigXMLFile();
 
@@ -367,27 +367,27 @@ public interface DistributedSystemConfig extends Cloneable {
   /**
    * Returns the membership-port-range property of the Distributed System. This 
    * range is given as two numbers separated by a minus sign.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public String getMembershipPortRange();
   
   /**
    * Sets the membership-port-range property of the Distributed System. This 
    * range is given as two numbers separated by a minus sign.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setMembershipPortRange(String membershipPortRange);
   
   
   /**
    * Sets the primary communication port number for the Distributed System.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public void setTcpPort(int port);
 
   /**
    * Returns the primary communication port number for the Distributed System.
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public int getTcpPort();
 
@@ -445,7 +445,7 @@ public interface DistributedSystemConfig extends Cloneable {
    * Returns the IP address to which the distributed system's server
    * sockets are bound.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public String getBindAddress();
 
@@ -453,7 +453,7 @@ public interface DistributedSystemConfig extends Cloneable {
    * Sets the IP address to which the distributed system's server
    * sockets are bound.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setBindAddress(String bindAddress);
   
@@ -568,13 +568,13 @@ public interface DistributedSystemConfig extends Cloneable {
    * Returns the refreshInterval in seconds used for auto-polling and updating
    * AdminDistributedSystem constituents including SystemMember, CacheServer,
    * SystemMemberCache and StatisticResource
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public int getRefreshInterval();
 
   /**
    * Sets the refreshInterval in seconds
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public void setRefreshInterval(int timeInSecs);
 
@@ -603,19 +603,19 @@ public interface DistributedSystemConfig extends Cloneable {
   /** 
    * Returns an array of configurations for statically known
    * {@link CacheVm}s.
-   * @since 5.7
+   * @since GemFire 5.7
    */ 
   public CacheVmConfig[] getCacheVmConfigs();
 
   /** 
    * Creates the configuration for a {@link CacheVm}.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public CacheVmConfig createCacheVmConfig();
 
   /** 
    * Removes the configuration for a {@link CacheVm}
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void removeCacheVmConfig(CacheVmConfig existing);
 
@@ -663,7 +663,7 @@ public interface DistributedSystemConfig extends Cloneable {
    * {@link DistributedSystemConfig.ConfigListener ConfigListener}s
    * that are registered on this config object are not cloned.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public Object clone() throws CloneNotSupportedException;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemHealthConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemHealthConfig.java
index d838328..5ece6cd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemHealthConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemHealthConfig.java
@@ -47,7 +47,7 @@ package com.gemstone.gemfire.admin;
  * </UL>
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  * */
 public interface DistributedSystemHealthConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocator.java
index 1c841b2..541a3e2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocator.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see DistributionLocatorConfig
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface DistributionLocator extends ManagedEntity {
@@ -38,7 +38,7 @@ public interface DistributionLocator extends ManagedEntity {
   /**
    * Returns the configuration object for this distribution locator.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public DistributionLocatorConfig getConfig();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocatorConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocatorConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocatorConfig.java
index e4bb2db..8c6770c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocatorConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributionLocatorConfig.java
@@ -38,7 +38,7 @@ import java.util.Properties;
  * @see AdminDistributedSystem#addDistributionLocator
  * @see com.gemstone.gemfire.distributed.Locator
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface DistributionLocatorConfig
@@ -74,14 +74,14 @@ public interface DistributionLocatorConfig
   /**
    * Sets the properties used to configure the locator's
    * DistributedSystem.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void setDistributedSystemProperties(Properties props);
   
   /**
    * Retrieves the properties used to configure the locator's
    * DistributedSystem.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public Properties getDistributedSystemProperties();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealth.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealth.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealth.java
index 6d3cb44..7665cbf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealth.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealth.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * <code>POOR_HEALTH</code>.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  * */
 public interface GemFireHealth {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealthConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealthConfig.java
index a5521dd..d7bc22c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealthConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireHealthConfig.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  * components of a GemFire distributed system.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  * */
 public interface GemFireHealthConfig

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntity.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntity.java
index c0010e5..d7e5d26 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntity.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntity.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see ManagedEntityConfig
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface ManagedEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntityConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntityConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntityConfig.java
index aacc3d0..e82acdc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntityConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/ManagedEntityConfig.java
@@ -25,7 +25,7 @@ package com.gemstone.gemfire.admin;
  *
  * @see ManagedEntity
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public interface ManagedEntityConfig extends Cloneable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/MemberHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/MemberHealthConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/MemberHealthConfig.java
index 5f864bc..f9c332d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/MemberHealthConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/MemberHealthConfig.java
@@ -46,7 +46,7 @@ package com.gemstone.gemfire.admin;
  * </UL>
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  * */
 public interface MemberHealthConfig {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/OperationCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/OperationCancelledException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/OperationCancelledException.java
index f10a3e8..5132626 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/OperationCancelledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/OperationCancelledException.java
@@ -24,7 +24,7 @@ package com.gemstone.gemfire.admin;
  * in a remote system member is cancelled.  The cancelation may occur
  * because the system member has left the distributed system.
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class OperationCancelledException extends RuntimeAdminException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionNotFoundException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionNotFoundException.java
index 5e53ca0..18a86f4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionNotFoundException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionNotFoundException.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.CacheRuntimeException;
  * <P>Also thrown by {@link com.gemstone.gemfire.DataSerializer#readRegion(java.io.DataInput)}
  * if the named region no longer exists.
  *
- * @since 3.5
+ * @since GemFire 3.5
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class RegionNotFoundException extends CacheRuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionSubRegionSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionSubRegionSnapshot.java
index 23f77ed..42ae983 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/RegionSubRegionSnapshot.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
  * This class is used by the monitoring tool.
  * 
  * 
- * @since 5.7
+ * @since GemFire 5.7
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
 public class RegionSubRegionSnapshot implements DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/RuntimeAdminException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/RuntimeAdminException.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/RuntimeAdminException.java
index 44606fc..08f5efc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/RuntimeAdminException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/RuntimeAdminException.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  * A <code>RuntimeAdminException</code> is thrown when a runtime errors occurs
  * during administration or monitoring of GemFire. 
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/Statistic.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/Statistic.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/Statistic.java
index 19cfb3f..731d024 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/Statistic.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/Statistic.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.admin;
 /**
  * Interface to represent a single statistic of a <code>StatisticResource</code>
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/admin/StatisticResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/StatisticResource.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/StatisticResource.java
index 037fc4c..3344b25 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/StatisticResource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/StatisticResource.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.admin;
  * system member.  A resource is comprised of one or many 
  * <code>Statistics</code>.
  *
- * @since     3.5
+ * @since GemFire     3.5
  *
  * @deprecated as of 7.0 use the <code><a href="{@docRoot}/com/gemstone/gemfire/management/package-summary.html">management</a></code> package instead
  */
@@ -45,7 +45,7 @@ public interface StatisticResource {
    * Gets the classification type of this resource.
    *
    * @return the classification type of this resource
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public String getType();
   



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/NonGrantorDestroyedProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/NonGrantorDestroyedProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/NonGrantorDestroyedProcessor.java
index 8fbbd8a..d371ad2 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/NonGrantorDestroyedProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/NonGrantorDestroyedProcessor.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
  * shutdown. The grantor should release all locks which are currently held
  * by the calling member.
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class NonGrantorDestroyedProcessor extends ReplyProcessor21 {
   private static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
index f7572af..a63cfb4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
@@ -528,7 +528,7 @@ public class InternalDistributedMember
    * [GemStone] Returns the process id of the VM that hosts the distribution
    * manager with this address.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public int getVmPid()
   {
@@ -539,7 +539,7 @@ public class InternalDistributedMember
    * [GemStone] Sets the process id of the VM that hosts the distribution
    * manager with this address.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void setVmPid(int p)
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberAttributes.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberAttributes.java
index 10148e0..7f2e92a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberAttributes.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberAttributes.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.distributed.DurableClientAttributes;
  * The attributes of a distributed member.  This is largely deprecated as
  * GMSMember holds all of this information.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class MemberAttributes {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MembershipManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MembershipManager.java
index eee823c..7e6fc87 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MembershipManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MembershipManager.java
@@ -54,7 +54,7 @@ public interface MembershipManager {
   /**
    * Returns an object that is used to sync access to the view.
    * While this lock is held the view can't change.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public ReadWriteLock getViewLock();
 
@@ -164,7 +164,7 @@ public interface MembershipManager {
    *    whether the state of the mcast messaging should be included
    * @return the current state of the communication channels between this
    *    process and the given distributed member
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public Map getMessageState(DistributedMember member, boolean includeMulticast);
 
@@ -177,7 +177,7 @@ public interface MembershipManager {
    *    The message states to wait for.  This should come from getMessageStates
    * @throws InterruptedException
    *    Thrown if the thread is interrupted
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void waitForMessageState(DistributedMember member, Map state)
     throws InterruptedException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetMember.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetMember.java
index bdaf579..1bab0d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetMember.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetMember.java
@@ -48,7 +48,7 @@ public interface NetMember extends Comparable<NetMember>
   
   /**
    * return a flag stating whether the member has network partition detection enabled
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean isNetworkPartitionDetectionEnabled();
   
@@ -56,7 +56,7 @@ public interface NetMember extends Comparable<NetMember>
   
   /**
    * return a flag stating whether the member can be the membership coordinator
-   * @since 5.6
+   * @since GemFire 5.6
    */
   public boolean preferredForCoordinator();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
index af4aec3..078281a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/NetView.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.internal.Version;
  * this class is not synchronized, so take that under advisement
  * if you decide to modify a view with add() or remove().
  * 
- * @since 5.5
+ * @since GemFire 5.5
  */
 public class NetView implements DataSerializableFixedID {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index bb1ffa1..a91306e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -377,7 +377,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
    A list of messages received during channel startup that couldn't be processed yet.
    Additions or removals of this list must be synchronized
    via {@link #startupLock}.
-   @since 5.0
+   @since GemFire 5.0
    */
   protected LinkedList<StartupEvent> startupMessages = new LinkedList<StartupEvent>();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoRequest.java
index d047630..eb90155 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoRequest.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.DataSerializable;
 /**
  * A request to the TCP server to provide information
  * about the server
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class InfoRequest implements DataSerializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoResponse.java
index 26572f2..953fe8d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/InfoResponse.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.DataSerializer;
 /**
  * A response from the TCP server with information
  * about the server
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class InfoResponse implements DataSerializable {
   private static final long serialVersionUID = 6249492407448855032L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownRequest.java
index 863c003..7d002ac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownRequest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.DataSerializable;
 
 /**
  * A request to the TCP server to shutdown
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ShutdownRequest implements DataSerializable {
   private static final long serialVersionUID = 7920535743546544136L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownResponse.java
index ead6f43..1dc37bf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/ShutdownResponse.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.DataSerializable;
 /**
  * A response from the TCP server that it received
  * the shutdown request
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class ShutdownResponse implements DataSerializable {
   private static final long serialVersionUID = -7223807212380360314L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
index 9d69048..f07c053 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpClient.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * 
  * TODO - refactor this to support keep-alive connections to the server. requestToServer
  * probably shouldn't a static method.
- * @since 5.7
+ * @since GemFire 5.7
  *
  */
 public class TcpClient {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpHandler.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpHandler.java
index 3b330bc..aaed5fd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpHandler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpHandler.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
 
 /**
  * A handler which responds to messages for the {@link TcpServer}
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface TcpHandler {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index 476636a..6ce0b08 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -69,7 +69,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
  * This code was factored out of GossipServer.java to allow multiple handlers to
  * share the same gossip server port.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public class TcpServer {
   /**
@@ -127,7 +127,7 @@ public class TcpServer {
    * handled by this member "With different GOSSIPVERION". If GOSSIPVERIONS
    * are same for then current GOSSIPVERSION should be used.
    *
-   * @since 7.1
+   * @since GemFire 7.1
    */
   static {
     GOSSIP_TO_GEMFIRE_VERSION_MAP.put(GOSSIPVERSION, Version.GFE_71.ordinal());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionRequest.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionRequest.java
index 60a1a4e..2cbfd97 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionRequest.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionRequest.java
@@ -23,7 +23,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 
 /**
- * @since 7.1
+ * @since GemFire 7.1
  */
 public class VersionRequest implements DataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionResponse.java
index e709e1a..7d5e08c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/VersionResponse.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 
 /**
  * Get GemFire version of the member running TcpServer.
- * @since 7.1
+ * @since GemFire 7.1
  */
 public class VersionResponse implements DataSerializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/unsafe/RegisterSignalHandlerSupport.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
index cdd680e..94ae4da 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/unsafe/RegisterSignalHandlerSupport.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.distributed.internal.unsafe;
 /**
  * The RegisterSignalHandlerSupport class is an ugly hack!
  * </p>
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class RegisterSignalHandlerSupport {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/i18n/LogWriterI18n.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/i18n/LogWriterI18n.java b/geode-core/src/main/java/com/gemstone/gemfire/i18n/LogWriterI18n.java
index 303929e..09198cf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/i18n/LogWriterI18n.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/i18n/LogWriterI18n.java
@@ -99,37 +99,37 @@ public interface LogWriterI18n {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object[] params, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object param, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Throwable ex);
     /**
      * Writes a message to this writer.
      * The message level is "severe".
-     * @since 6.0 
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object[] params);
     /**
      * Writes a message to this writer.
      * The message level is "severe".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID, Object param);
     /**
      * Writes a message to this writer.
      * The message level is "severe".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void severe(StringId msgID);
     /**
@@ -144,37 +144,37 @@ public interface LogWriterI18n {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object[] params, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object param, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Throwable ex);
     /**
      * Writes a message to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object[] params);
     /**
      * Writes a message to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID, Object param);
     /**
      * Writes a message to this writer.
      * The message level is "error".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void error(StringId msgID);
     /**
@@ -189,37 +189,37 @@ public interface LogWriterI18n {
      /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object[] params, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object param, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Throwable ex);
     /**
      * Writes a message to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object[] params);
     /**
      * Writes a message to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID, Object param);
     /**
      * Writes a message to this writer.
      * The message level is "warning".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void warning(StringId msgID);
     /**
@@ -234,37 +234,37 @@ public interface LogWriterI18n {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object[] params, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object param, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Throwable ex);
     /**
      * Writes a message to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object[] params);
     /**
      * Writes a message to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID, Object param);
     /**
      * Writes a message to this writer.
      * The message level is "info".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void info(StringId msgID);
     /**
@@ -279,37 +279,37 @@ public interface LogWriterI18n {
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object[] params, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object param, Throwable ex);
     /**
      * Writes both a message and exception to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Throwable ex);
     /**
      * Writes a message to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object[] params);
     /**
      * Writes a message to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID, Object param);
     /**
      * Writes a message to this writer.
      * The message level is "config".
-     * @since 6.0
+     * @since GemFire 6.0
      */
     public void config(StringId msgID);
     /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/i18n/StringId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/i18n/StringId.java b/geode-core/src/main/java/com/gemstone/gemfire/i18n/StringId.java
index 20b63b0..221d66b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/i18n/StringId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/i18n/StringId.java
@@ -25,7 +25,7 @@ import java.util.Locale;
 /**
  * This class forms the basis of the i18n strategy. Its primary function is to
  * be used as a key to be passed to an instance of StringIdResourceBundle.
- * @since 6.0 
+ * @since GemFire 6.0
  */
 public class StringId {
   /** The root name of the ResourceBundle */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
index 8b4d47b..886258b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractStatisticsFactory.java
@@ -34,7 +34,7 @@ import java.util.List;
  * It can be used in contexts that do not have the GemFire product
  * or in vm's that do not have a distributed system nor a gemfire connection.
  *
- * @since 7.0
+ * @since GemFire 7.0
  */
 public abstract class AbstractStatisticsFactory 
     implements StatisticsFactory, StatisticsManager {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteArrayDataInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteArrayDataInput.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteArrayDataInput.java
index 7615dac..614bcb8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteArrayDataInput.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteArrayDataInput.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.VersionedDataStream;
  * also implements {@link VersionedDataStream} for a stream coming from a
  * different product version.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public class ByteArrayDataInput extends InputStream implements DataInput,
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteBufferOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteBufferOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteBufferOutputStream.java
index efcc510..043eb96 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteBufferOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ByteBufferOutputStream.java
@@ -20,7 +20,7 @@ import java.io.*;
 import java.nio.*;
 
 /** An OutputStream that wraps to a ByteBuffer
- * @since 3.5
+ * @since GemFire 3.5
  */
 
 public class ByteBufferOutputStream extends OutputStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
index 028a57e..8d3cf0f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
@@ -62,7 +62,7 @@ import com.gemstone.gemfire.internal.util.CollectionUtils;
  * in either a {@link java.lang.SecurityException SecurityException} or a null, then that class loader is quietly
  * skipped. Duplicate class loaders will be skipped.
  * 
- * @since 6.5.1.4
+ * @since GemFire 6.5.1.4
  */
 public final class ClassPathLoader {
   /*
@@ -680,7 +680,7 @@ public final class ClassPathLoader {
    * Wrap this {@link ClassPathLoader} with a {@link ClassLoader} facade.
    * 
    * @return {@link ClassLoader} facade.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public ClassLoader asClassLoader() {
     return new ClassLoader() {
@@ -720,7 +720,7 @@ public final class ClassPathLoader {
    * <code>ClassPathLoader.getLatest().asClassLoader();</code>.
    * 
    * @return {@link ClassLoader} for current {@link ClassPathLoader}.
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public static final ClassLoader getLatestAsClassLoader() {
     return latest.get().asClassLoader();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
index 36c450f..e017a9d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
@@ -93,17 +93,17 @@ public interface Config {
   public boolean sameAs(Config v);
   /**
    * Converts the contents of this config to a property instance.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public Properties toProperties();
   /**
    * Writes this config to the specified file.
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void toFile(File f) throws IOException;
   /**
    * Returns a formatted string suitable for logging.
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public String toLoggerString();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ConfigSource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ConfigSource.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ConfigSource.java
index 72db147..51c2caf 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ConfigSource.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ConfigSource.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * Describes where the value of a configuration attribute came from.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class ConfigSource implements Serializable {
   private static final long serialVersionUID = -4097017272431018553L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
index 8d91c6b..cef660a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSCODE.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.DataSerializer;
  * It is basically an Enum and could be changed to one once we drop 1.4.
  * The allowed range of these codes is -128..127 inclusive (i.e. byte).
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface DSCODE {
   /**
@@ -41,37 +41,37 @@ public interface DSCODE {
   /**
    * A header byte meaning that the next element in the stream is a
    * {@link DataSerializableFixedID} whose id is a single signed byte.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DS_FIXED_ID_BYTE = 1;
   /**
    * A header byte meaning that the next element in the stream is a
    * {@link DataSerializableFixedID} whose id is a single signed short.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DS_FIXED_ID_SHORT = 2;
   /**
    * A header byte meaning that the next element in the stream is a
    * {@link DataSerializableFixedID} whose id is a single signed int.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DS_FIXED_ID_INT = 3;
   /**
    * A header byte meaning that the next element in the stream is a
    * {@link DataSerializableFixedID} whose id is <code>NO_FIXED_ID</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte DS_NO_FIXED_ID = 4;
 
   /** A header byte meaning that the object was serialized by a user's
    * <code>DataSerializer</code> and the id is encoded with 2 bytes.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte USER_CLASS_2 = 5;
 
   /** A header byte meaning that the object was serialized by a user's
    * <code>DataSerializer</code> and the id is encoded with 4 bytes.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte USER_CLASS_4 = 6;
 
@@ -86,7 +86,7 @@ public interface DSCODE {
 
   /** A header byte meaning that the next element in the stream is a
    * <code>Properties</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte PROPERTIES = 11;
 
@@ -106,11 +106,11 @@ public interface DSCODE {
   public static final byte VOID_TYPE = 25;
 
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte BOOLEAN_ARRAY = 26;
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte CHAR_ARRAY = 27;
   
@@ -119,14 +119,14 @@ public interface DSCODE {
   /** A header byte meaning that a DataSerializable that was
    * registered with the Instantiator was data serialized
    * using four bytes for its ID.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte USER_DATA_SERIALIZABLE_4 = 37;
 
   /** A header byte meaning that a DataSerializable that was
    * registered with the Instantiator was data serialized
    * using two bytes for its ID.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte USER_DATA_SERIALIZABLE_2 = 38;
 
@@ -258,43 +258,43 @@ public interface DSCODE {
 
   /** A header byte meaning that the next element in the stream is a
    * <code>Hashtable</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte HASH_TABLE = 70;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>Vector</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte VECTOR = 71;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>IdentityHashMap</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte IDENTITY_HASH_MAP = 72;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>LinkedHashSet</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte LINKED_HASH_SET = 73;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>Stack</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte STACK = 74;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>TreeMap</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte TREE_MAP = 75;
 
   /** A header byte meaning that the next element in the stream is a
    * <code>TreeSet</code>.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte TREE_SET = 76;
 
@@ -310,7 +310,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is a
    * buffer of 1-byte characters to turn into a String whose length
    * is > 0xFFFF.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte HUGE_STRING_BYTES = 88;
 
@@ -318,7 +318,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is a
    * buffer of 2-byte characters to turn into a String whose length
    * is > 0xFFFF.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte HUGE_STRING = 89;
 
@@ -326,7 +326,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is an
    * SQLFabric DataValueDescriptor array.
    * 
-   * @since 6.0
+   * @since GemFire 6.0
    */
   public static final byte SQLF_DVD_ARR = 90;
 
@@ -338,7 +338,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is an
    * object of SQLFabric XML type.
    * 
-   * @since 6.5
+   * @since GemFire 6.5
    */
   public static final byte SQLF_XML = 92;
 
@@ -346,7 +346,7 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is a
    * PdxSerializable object.
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static final byte PDX = 93;
   
@@ -354,18 +354,18 @@ public interface DSCODE {
    * A header byte meaning that the next element in the stream is an
    * enum whose type is defined in the pdx registry.
    * 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte PDX_ENUM = 94;
 
   /**
    * java.math.BigInteger
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte BIG_INTEGER = 95;
   /**
    * java.math.BigDecimal
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte BIG_DECIMAL = 96;
 
@@ -375,37 +375,37 @@ public interface DSCODE {
    * header byte meaning that the next element in the stream is a
    * ConcurrentHashMap object.
    * 
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static final byte CONCURRENT_HASH_MAP = 97;
 
   /**
    * java.util.UUID
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte UUID = 98;
   /**
    * java.sql.Timestamp
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte TIMESTAMP = 99;
   
   /**
    * Used for enums that need to always be deserialized into their enum domain class.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte GEMFIRE_ENUM = 100;
   /**
    * Used for enums that need to be encoded inline because
    * the pdx registry may not be available.
    * During deserialization this type of enum may be deserialized as a PdxInstance.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final byte PDX_INLINE_ENUM = 101;
   
   /**
    * Used for wildcard searches in soplogs with composite keys.
-   * @since 8.0 
+   * @since GemFire 8.0
    */
   public static final byte WILDCARD = 102;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
index bd78f5a..5f0002a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
@@ -417,7 +417,7 @@ import com.gemstone.gemfire.pdx.internal.EnumInfo;
  * Note that this class implements DataSerializableFixedID to inherit constants but
  * is not actually an instance of this interface.
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public final class DSFIDFactory implements DataSerializableFixedID {
    

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
index 7427f90..beaadb1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
@@ -58,7 +58,7 @@ import java.io.*;
  *
  * @see DataSerializer
  *
- * @since 5.7
+ * @since GemFire 5.7
  */
 public interface DataSerializableFixedID extends SerializationVersions {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
index 6e5e428..f77b594 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
  * This class is used to work with a managed VM that hosts a {@link
  * com.gemstone.gemfire.distributed.Locator}.
  *
- * @since 2.0
+ * @since GemFire 2.0
  */
 public class DistributionLocator  {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
index 2d4462e..83d4055 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DummyStatisticsImpl.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.*;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public class DummyStatisticsImpl implements Statistics {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ExternalizableDSFID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ExternalizableDSFID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ExternalizableDSFID.java
index 47aef99..13a86d3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ExternalizableDSFID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ExternalizableDSFID.java
@@ -23,7 +23,7 @@ import java.io.*;
  * addition to being DataSerializableFixedID.
  * <p> Note: subclasses must also provide a zero-arg constructor
  *
- * @since 5.7 
+ * @since GemFire 5.7
  */
 public abstract class ExternalizableDSFID
   implements DataSerializableFixedID, Externalizable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
index b63c4d2..5930506 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireStatSampler.java
@@ -74,7 +74,7 @@ public final class GemFireStatSampler extends HostStatSampler  {
    * that <code>null</code> will be returned if operating statistics
    * are disabled.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public final ProcessStats getProcessStats() {
     return this.processStats;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
index fa19049..f7a3628 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireUtilLauncher.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.CacheServerLauncher;
  * Usage:
  * notYetWritenScript <utility> <utility arguments>
  *
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class GemFireUtilLauncher {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
index 4bbd616..baf03b1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
@@ -196,7 +196,7 @@ public class GemFireVersion {
    * Returns the revision of the source code on which GemFire was
    * built.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static String getSourceRevision() {
     GemFireVersion v = getInstance();
@@ -211,7 +211,7 @@ public class GemFireVersion {
   /**
    * Returns the source code repository from which GemFire was built.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static String getSourceRepository() {
     GemFireVersion v = getInstance();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/GfeConsoleReaderFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/GfeConsoleReaderFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/GfeConsoleReaderFactory.java
index 202277e..2ad94a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GfeConsoleReaderFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GfeConsoleReaderFactory.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.management.internal.cli.util.GfshConsoleReader;
  * <code>System.console()</code>
  * 
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  */
 public class GfeConsoleReaderFactory {
   private static GfeConsoleReader defaultConsoleReader = createConsoleReader();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
index 20d01da..11233b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSource;
  * It is always better to use this class instead ByteArrayOutputStream.
  * <p>This class is not thread safe
  *
- *  @since 5.0.2
+ *  @since GemFire 5.0.2
  * 
  *
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatHelper.java
index e204eb6..7ff0b1b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatHelper.java
@@ -191,7 +191,7 @@ public class HostStatHelper {
    * given <code>Statistics</code>.
    *
    * @see #newProcess
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static ProcessStats newProcessStats(Statistics stats) {
     switch (osCode) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
index d1d6801..452e6dd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
@@ -344,7 +344,7 @@ public abstract class HostStatSampler
    * use {@link #waitForInitialization(long)} instead.
    *
    * @see #initSpecialStats
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public final void waitForInitialization() throws InterruptedException {
     this.statSamplerInitializedLatch.await();
@@ -356,7 +356,7 @@ public abstract class HostStatSampler
    * within tests.
    *
    * @see #initSpecialStats
-   * @since 7.0
+   * @since GemFire 7.0
    */
   public final boolean waitForInitialization(long ms) throws InterruptedException {
     return this.statSamplerInitializedLatch.await(ms);
@@ -369,7 +369,7 @@ public abstract class HostStatSampler
   /**
    * Returns the <code>VMStatsContract</code> for this VM.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public final VMStatsContract getVMStats() {
     return this.vmStats;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
index bff592b..67629e9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
@@ -124,7 +124,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
  * distribution messaging (and shared memory management) needed to
  * support data serialization.
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public abstract class InternalDataSerializer extends DataSerializer implements DSCODE {
   private static final Logger logger = LogService.getLogger();
@@ -145,7 +145,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
   private static final String serializationVersionTxt = System.getProperty("gemfire.serializationVersion");
   /**
    * Any time new serialization format is added then a new enum needs to be added here.
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   private static enum SERIALIZATION_VERSION {
     vINVALID,
@@ -1732,7 +1732,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    *
    * @see #readSet
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static void writeSet(Collection<?> set, DataOutput out)
       throws IOException {
@@ -1768,7 +1768,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    *
    * @see #writeSet
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public static Set readSet(DataInput in) 
     throws IOException, ClassNotFoundException {
@@ -2099,7 +2099,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    *           A problem occurs while writing to <code>out</code>
    * 
    * @see DataSerializer#readCharArray
-   * @since 6.6
+   * @since GemFire 6.6
    */
   public static void writeCharArray(char[] array, int length, DataOutput out)
       throws IOException {
@@ -2235,7 +2235,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
   
   /**
    * @throws IOException 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   private static void writePdxEnum(Enum<?> e, DataOutput out) throws IOException {
     TypeRegistry tr =
@@ -2624,11 +2624,11 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
 
   public static final byte NULL_ARRAY = -1; // array is null
   /**
-   * @since 5.7 
+   * @since GemFire 5.7
    */
   private static final byte SHORT_ARRAY_LEN = -2; // array len encoded as unsigned short in next 2 bytes
   /**
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static final byte INT_ARRAY_LEN = -3; // array len encoded as int in next 4 bytes
   private static final int MAX_BYTE_ARRAY_LEN = ((byte)-4) & 0xFF; 
@@ -2759,7 +2759,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    * @throws IOException
    *         A problem occurs while reading from <code>in</code>
    *
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static String readString(DataInput in, byte header) throws IOException {
     if (header == DSCODE.STRING_BYTES) {
@@ -2818,7 +2818,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
   /**
    * Just like readObject but make sure and pdx deserialized is not
    * a PdxInstance. 
-   * @since 6.6.2
+   * @since GemFire 6.6.2
    */
   public static final <T> T readNonPdxInstanceObject(final DataInput in)
   throws IOException, ClassNotFoundException {
@@ -3338,7 +3338,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    * registration message does, the deserializer will wait an amount
    * of time for the registration message to arrive.
    * Made public for unit test access.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public static class GetMarker extends Marker {
     /**
@@ -3394,7 +3394,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    * of being registered.
    * It is possible for getSerializer to return <code>null</code>
    * 
-   * @since 5.7
+   * @since GemFire 5.7
    */
   static class InitMarker extends Marker {
     /**
@@ -3793,7 +3793,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
   /**
    * Used to implement serialization code for the well known classes we support
    * in DataSerializer.
-   * @since 5.7
+   * @since GemFire 5.7
    */
   protected static abstract class WellKnownDS extends DataSerializer {
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalEntity.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalEntity.java
index 3c1baa7..2b76546 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalEntity.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalEntity.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.internal;
  * would typically be stored. For example, registering functions for internal use. When determining what to do, or how
  * to display these objects, other classes may use this interface as a filter to eliminate internal objects.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  * 
  */
 public interface InternalEntity {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalInstantiator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalInstantiator.java
index 9b28eb4..0398787 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalInstantiator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalInstantiator.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.i18n.StringId;
  * Contains the implementation of {@link com.gemstone.gemfire.Instantiator}
  * registration and distribution messaging (and shared memory management).
  *
- * @since 3.5
+ * @since GemFire 3.5
  */
 public class InternalInstantiator {
 
@@ -977,7 +977,7 @@ public class InternalInstantiator {
    * registered.
    *
    *
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public static final class RegistrationContextMessage extends RegistrationMessage {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalStatisticsDisabledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalStatisticsDisabledException.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalStatisticsDisabledException.java
index 9147965..09a474a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalStatisticsDisabledException.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalStatisticsDisabledException.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.GemFireCheckedException;
  * @see com.gemstone.gemfire.cache.RegionAttributes#getStatisticsEnabled
  * @see com.gemstone.gemfire.cache.Region#getStatistics
  * @see com.gemstone.gemfire.cache.Region.Entry#getStatistics
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class InternalStatisticsDisabledException extends GemFireCheckedException {
 private static final long serialVersionUID = 4146181546364258311L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/JarClassLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/JarClassLoader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/JarClassLoader.java
index 13138e7..183a477 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/JarClassLoader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/JarClassLoader.java
@@ -58,7 +58,7 @@ import com.gemstone.gemfire.pdx.internal.TypeRegistry;
 /**
  * ClassLoader for a single JAR file.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 public class JarClassLoader extends ClassLoader {
   private final static Logger logger = LogService.getLogger();
@@ -669,7 +669,7 @@ public class JarClassLoader extends ClassLoader {
    * that the lock will be obtained in all cases (it's reentrant), and then the channel position will be modified by
    * both instances causing arbitrary values being returned from the read() method.
    * 
-   * @since 7.0
+   * @since GemFire 7.0
    */
   private class ChannelInputStream extends InputStream {
     private final FileChannel fileChannel;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcessStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcessStats.java
index ff8c4ba..05bc284 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcessStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcessStats.java
@@ -62,7 +62,7 @@ public class LinuxProcessStats
    * Returns a <code>ProcessStats</code> that wraps Linux process
    * <code>Statistics</code>. 
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static ProcessStats createProcessStats(final Statistics stats) {
     if (stats instanceof LocalStatisticsImpl) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/LocalStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/LocalStatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/LocalStatisticsImpl.java
index 99957f2..cf59e1f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/LocalStatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/LocalStatisticsImpl.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.*;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public class LocalStatisticsImpl extends StatisticsImpl {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
index 105aca1..d15dda4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
@@ -57,7 +57,7 @@ import java.util.Properties;
  * entries are transfered from the server to the client, they are then 
  * stored in new files in these directories.
  * 
- * @since 6.0.1
+ * @since GemFire 6.0.1
  *
  */
 public class MigrationClient {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
index b205799..bbcc148 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
@@ -102,7 +102,7 @@ import java.util.Properties;
  * The client is then run with a different cache description having different
  * disk-dirs to hold the migrated information.
  * 
- * @since 6.0.1
+ * @since GemFire 6.0.1
  */
 public class MigrationServer {
   final static boolean VERBOSE = Boolean.getBoolean("Migration.VERBOSE");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/NullDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/NullDataOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/NullDataOutputStream.java
index 6e7784b..153ae82 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/NullDataOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/NullDataOutputStream.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.DataSerializer;
  * consuming any memory.
  * <p>This class is not thread safe
  *
- *  @since 5.0.2
+ *  @since GemFire 5.0.2
  * 
  */
 public final class NullDataOutputStream extends OutputStream implements

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
index afe2445..18d65d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
@@ -334,7 +334,7 @@ public class OSProcess {
    * @throws IllegalArgumentException
    *         If <code>pid</code> is not positive
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   private static void checkPid(int pid) {
     if (pid <= 0) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/OSXProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSXProcessStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSXProcessStats.java
index 57c6a46..0706c7b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSXProcessStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSXProcessStats.java
@@ -65,7 +65,7 @@ public class OSXProcessStats
    * Returns a <code>ProcessStats</code> that wraps OS X process
    * <code>Statistics</code>. 
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static ProcessStats createProcessStats(final Statistics stats) {
     if (stats instanceof LocalStatisticsImpl) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjIdConcurrentMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjIdConcurrentMap.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjIdConcurrentMap.java
index a0eee99..00e4153 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjIdConcurrentMap.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjIdConcurrentMap.java
@@ -83,7 +83,7 @@ import java.io.IOException;
  * <a href="{@docRoot}/../technotes/guides/collections/index.html">
  * Java Collections Framework</a>.
  *
- * @since 1.5
+ * @since GemFire 1.5
  * @param <V> the type of mapped values
  * 
  * Keys on this map are a primitive "int".
@@ -642,7 +642,7 @@ public class ObjIdConcurrentMap<V> /*extends AbstractMap<K, V>*/
      * @throws IllegalArgumentException if the initial capacity of
      * elements is negative or the load factor is nonpositive
      *
-     * @since 1.6
+     * @since GemFire 1.6
      */
     public ObjIdConcurrentMap(int initialCapacity, float loadFactor) {
         this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjToByteArraySerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjToByteArraySerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjToByteArraySerializer.java
index f97a5c1..296da94 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjToByteArraySerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ObjToByteArraySerializer.java
@@ -22,7 +22,7 @@ import java.io.*;
 /** ObjToByteArraySerializer allows an object to be serialized as a byte array
  * so that the other side sees a byte array arrive.
  *
- *  @since 5.0.2
+ *  @since GemFire 5.0.2
  * 
  */
 public interface ObjToByteArraySerializer extends DataOutput {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/OneTaskOnlyExecutor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/OneTaskOnlyExecutor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/OneTaskOnlyExecutor.java
index 2ddc2ae..888fa93 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/OneTaskOnlyExecutor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/OneTaskOnlyExecutor.java
@@ -44,7 +44,7 @@ import java.util.concurrent.TimeUnit;
  * the currently queued task will be canceled and the new task will be submitted to the queue
  * with the new time. 
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 @SuppressWarnings("synthetic-access")
 public class OneTaskOnlyExecutor {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/OsStatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/OsStatisticsFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/OsStatisticsFactory.java
index ed79006..7dac90e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/OsStatisticsFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/OsStatisticsFactory.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.*;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public interface OsStatisticsFactory {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/ProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ProcessStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ProcessStats.java
index 4fd1986..c80e340 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ProcessStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ProcessStats.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.Statistics;
  * This is necessary for monitoring the health of GemFire components.
  *
  *
- * @since 3.5
+ * @since GemFire 3.5
  * */
 public abstract class ProcessStats {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
index 82acf75..769a959 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
@@ -27,7 +27,7 @@ public final class PureJavaMode {
   public final static String PURE_MODE_PROPERTY = "gemfire.pureJavaMode";
   /**
    * System property to set to true enable debug information regarding native library loading.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public final static String LOADLIBRARY_DEBUG_PROPERTY = "gemfire.loadLibrary.debug";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/Sendable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Sendable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Sendable.java
index e4542e7..17fa715 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Sendable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Sendable.java
@@ -25,7 +25,7 @@ import java.io.IOException;
  * Note that you are responsible for sending all the bytes that represent your instance,
  * even bytes describing your class name if those are required.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public interface Sendable {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/SetUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SetUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SetUtils.java
index 0f48292..883d0a3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SetUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SetUtils.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 /**
  * Utility methods for managing and using Sets 
- * @since gemfire59poc
+ * @since GemFire 59poc
  * 
  */
 public final class SetUtils {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
index f79aeba..0edb02d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
@@ -212,7 +212,7 @@ public class SharedLibrary {
     /**
      * Accessor method for the is64Bit flag
      * @return returns a boolean indicating if the 64bit native library was loaded.
-     * @since 5.1
+     * @since GemFire 5.1
      */
     public final static boolean getIs64Bit() { return PureJavaMode.is64Bit(); }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/SolarisProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SolarisProcessStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SolarisProcessStats.java
index 0b44439..d07d398 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SolarisProcessStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SolarisProcessStats.java
@@ -201,7 +201,7 @@ public class SolarisProcessStats
    * Returns a <code>ProcessStats</code> that wraps Solaris process
    * <code>Statistics</code>. 
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static ProcessStats createProcessStats(final Statistics stats) {
     if (stats instanceof LocalStatisticsImpl) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticDescriptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticDescriptorImpl.java
index f00b30f..2f407ba 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticDescriptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticDescriptorImpl.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see Statistics
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public final class StatisticDescriptorImpl implements StatisticDescriptor {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
index a754916..2344d93 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsImpl.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class StatisticsImpl implements Statistics {
 
@@ -365,7 +365,7 @@ public abstract class StatisticsImpl implements Statistics {
    * For internal use only.
    * Tells the implementation to prepare the data in this instance
    * for sampling.
-   * @since 5.1
+   * @since GemFire 5.1
    */
   public void prepareForSample() {
     // nothing needed in this impl.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeFactoryImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeFactoryImpl.java
index 7f2e48f..e4688d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeFactoryImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeFactoryImpl.java
@@ -30,7 +30,7 @@ import java.util.*;
  * @see <A href="package-summary.html#statistics">Package introduction</A>
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  *
  */
 public class StatisticsTypeFactoryImpl implements StatisticsTypeFactory {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
index 8046a1b..2a29d46 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatisticsTypeImpl.java
@@ -29,7 +29,7 @@ import java.util.*;
  * @see Statistics
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class StatisticsTypeImpl implements StatisticsType {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index 515b27d..9f4a703 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -402,7 +402,7 @@ public class SystemAdmin {
   /**
    * Tails the end of the locator's log file
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public String locatorTailLog(File directory) {
     File logFile =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemFailureTestHook.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemFailureTestHook.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemFailureTestHook.java
index 6475f0d..07c8b45 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemFailureTestHook.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemFailureTestHook.java
@@ -20,7 +20,7 @@ package com.gemstone.gemfire.internal;
  * Allows tests to expect certain exceptions without the SystemFailure watchdog getting upset.
  * See bug 46988.
  * 
- * @since 7.0.1
+ * @since GemFire 7.0.1
  */
 public class SystemFailureTestHook {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/UniqueIdGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/UniqueIdGenerator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/UniqueIdGenerator.java
index 977d7f8..c1b99d6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/UniqueIdGenerator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/UniqueIdGenerator.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * <p>
  * Instances of this class are thread safe.
  *
- * @since 5.0.2
+ * @since GemFire 5.0.2
    
 */
 public class UniqueIdGenerator {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
index 258eaf0..513b5bd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Version.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
  * deserialization problems.  Client/server code also uses greater-than
  * comparison of ordinals in backward-compatibility checks.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 public final class Version implements Comparable<Version> {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataInputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataInputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataInputStream.java
index 12d3956..9ec4e13 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataInputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataInputStream.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
  * {@link VersionedDataStream} for a stream coming from a different product
  * version.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public final class VersionedDataInputStream extends DataInputStream implements
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataOutputStream.java
index a664b43..40b3b40 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataOutputStream.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
  * An extension of {@link DataOutputStream} that implements
  * {@link VersionedDataStream}.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public final class VersionedDataOutputStream extends DataOutputStream implements
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
index a2711ff..7c5ca11 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedDataStream.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.DataSerializable;
  * {@link InternalDataSerializer#getVersionForDataStream} methods) and deal with
  * serialization with previous {@link Version}s appropriately.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public interface VersionedDataStream {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectInput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectInput.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectInput.java
index 0ac5dc8..e2fc450 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectInput.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectInput.java
@@ -25,7 +25,7 @@ import java.io.ObjectInput;
  * {@link VersionedDataStream} wrapping given {@link ObjectInput} for a stream
  * coming from a different product version.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public final class VersionedObjectInput implements ObjectInput,
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectOutput.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectOutput.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectOutput.java
index 06ca44a..39fdafe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectOutput.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/VersionedObjectOutput.java
@@ -25,7 +25,7 @@ import java.io.ObjectOutput;
  * {@link VersionedDataStream} wrapping given {@link ObjectOutput} for a stream
  * directed to a different product version.
  * 
- * @since 7.1
+ * @since GemFire 7.1
  */
 public final class VersionedObjectOutput implements ObjectOutput,
     VersionedDataStream {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/WindowsProcessStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/WindowsProcessStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/WindowsProcessStats.java
index f06a608..a671717 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/WindowsProcessStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/WindowsProcessStats.java
@@ -143,7 +143,7 @@ public class WindowsProcessStats
    * Returns a <code>ProcessStats</code> that wraps Windows process
    * <code>Statistics</code>.
    * 
-   * @since 3.5
+   * @since GemFire 3.5
    */
   static ProcessStats createProcessStats(final Statistics stats) {
     if (stats instanceof LocalStatisticsImpl) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/AdminBridgeServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/AdminBridgeServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/AdminBridgeServer.java
index 86b6769..9ff857e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/AdminBridgeServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/AdminBridgeServer.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.server.CacheServer;
  * A representation of <code>CacheServer</code> that is used for
  * administration. 
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public interface AdminBridgeServer extends CacheServer {
   /**



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

Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QueryObjectSerializationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QueryObjectSerializationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QueryObjectSerializationJUnitTest.java
index b593da5..6d1bc49 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QueryObjectSerializationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/QueryObjectSerializationJUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests the Serialization of the Query related class.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 @Category(UnitTest.class)
 public class QueryObjectSerializationJUnitTest implements Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 70e3bfc..b856007 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
 /**
  *
- * @since 6.6.1
+ * @since GemFire 6.6.1
  */
 @Category(IntegrationTest.class)
 public class NewDeclarativeIndexCreationJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
index 94ac2f6..e8fac48 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34387DUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test create + localDestroy for bug 34387
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class Bug34387DUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
index b754905..2d1dcf4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug34948DUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test to make sure cache values are lazily deserialized
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class Bug34948DUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
index e90227a..9714bdd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug35214DUnitTest.java
@@ -41,7 +41,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Make sure entry expiration does not happen during gii for bug 35214
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class Bug35214DUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
index 1c4b95d..2c76556 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38013DUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test to make sure PR cache values are lazily deserialized
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class Bug38013DUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
index 7e4acbf..f222609 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 
 /**
  *
- * @since bugfix5.7
+ * @since GemFire bugfix5.7
  */
 public class Bug38741DUnitTest extends ClientServerTestCase {
   private static final long serialVersionUID = 1L;
@@ -78,7 +78,7 @@ public class Bug38741DUnitTest extends ClientServerTestCase {
    * Test that CopyOnRead doesn't cause {@link HARegionQueue#peek()} to create a copy,
    * assuming that creating copies performs a serialize and de-serialize operation.
    * @throws Exception when there is a failure
-   * @since bugfix5.7
+   * @since GemFire bugfix5.7
    */
   public void testCopyOnReadWithBridgeServer() throws Exception {
     final Host h = Host.getHost(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
index 92b2490..77e0d30 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
  * attributes by CacheXmlParser when cache.xml has eviction attributes with no
  * eviction action specified. which was being set to EvictionAction.NONE
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 @Category(IntegrationTest.class)
 @Ignore("Test is broken and was named Bug40662JUnitDisabledTest")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
index a2f92d7..d005aec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
@@ -51,7 +51,7 @@ import static com.jayway.awaitility.Awaitility.with;
  * that is shorter than an existing one,
  * ensure the new shorter time is honored.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(IntegrationTest.class)
 @SuppressWarnings({ "unchecked", "rawtypes" })

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
index 0705dd9..798fc1b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheCloseDUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.cache.RegionAttributes;
 /**
  * Test to make sure cache close is working.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheCloseDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
index 92e5bdf..ac028db 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheListenerTestCase.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * @see MultiVMRegionTestCase#testRemoteCacheWriter
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheListenerTestCase
   extends CacheLoaderTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
index 21e7a7e..265e086 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLoaderTestCase.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
  *
  * @see MultiVMRegionTestCase#testRemoteCacheLoader
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheLoaderTestCase
   extends CacheWriterTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index 3a96728..ae14819 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 /**
  * Test to make sure cache close is working.
  *
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class CacheLogRollDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheSerializableRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheSerializableRunnable.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheSerializableRunnable.java
index 690bac2..4e01601 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheSerializableRunnable.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheSerializableRunnable.java
@@ -31,7 +31,7 @@ import junit.framework.AssertionFailedError;
  * try/catch code in the tests.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheSerializableRunnable
   extends SerializableRunnable 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
index 18bb79f..8fd89ef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheStatisticsDUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
  * Region} and a {@link com.gemstone.gemfire.cache.Region.Entry}.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheStatisticsDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
index 0c0a919..f920173 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheTestCase.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit3CacheTestCase;
  * The abstract superclass of tests that require the creation of a
  * {@link Cache}.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheTestCase extends JUnit3CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
index 8af2089..1ad1caa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheWriterTestCase.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.*;
  * @see MultiVMRegionTestCase#testRemoteCacheWriter
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class CacheWriterTestCase
   extends RegionAttributesTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
index 7648c26..48fa935 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml30DUnitTest.java
@@ -77,7 +77,7 @@ import com.gemstone.gemfire.util.test.TestUtil;
  * 3.X (3.0, 3.2, 3.5).  Tests for syntax added in subsequent releases
  * is tested by subclasses of this class.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class CacheXml30DUnitTest extends CacheXmlTestCase {
 
@@ -575,7 +575,7 @@ public class CacheXml30DUnitTest extends CacheXmlTestCase {
    * Tests to make sure that the example cache.xml file in the API
    * documentation conforms to the DTD.
    *
-   * @since 3.2.1
+   * @since GemFire 3.2.1
    */
   public void testExampleCacheXmlFile() throws Exception {
     // Check for old example files

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
index 5b16a81..134cf5f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml40DUnitTest.java
@@ -29,7 +29,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
  * Tests the declarative caching functionality introduced in GemFire
  * 4.0. 
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
 
@@ -50,7 +50,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
   /**
    * Tests the cache server attribute
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void testServer() {
     CacheCreation cache = new CacheCreation();
@@ -63,7 +63,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
   /**
    * Tests declarative bridge servers
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void testBridgeServers() {
     CacheCreation cache = new CacheCreation();
@@ -108,7 +108,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
   /**
    * Tests a cache listener with no parameters
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void testTransactionListener() {
     CacheCreation cache = new CacheCreation();
@@ -121,7 +121,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
   /**
    * Tests transaction manager with no listener
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void testCacheTransactionManager() {
     CacheCreation cache = new CacheCreation();
@@ -134,7 +134,7 @@ public class CacheXml40DUnitTest extends CacheXml30DUnitTest {
    * Tests the value constraints region attribute that was added in
    * GemFire 4.0.
    *
-   * @since 4.1
+   * @since GemFire 4.1
    */
   public void testConstrainedValues() throws CacheException {
     CacheCreation cache = new CacheCreation();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
index ad851ad..617f9ca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml41DUnitTest.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 /**
  * Tests the declarative caching functionality introduced in GemFire 4.1.
  * 
- * @since 4.1
+ * @since GemFire 4.1
  */
 
 public class CacheXml41DUnitTest extends CacheXml40DUnitTest
@@ -532,7 +532,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
   //}
   /**
    * Test Publisher region attribute
-   * @since 4.2.3
+   * @since GemFire 4.2.3
    * @deprecated as of GemFire 6.5.
    */
   public void testPublisherAttribute() throws CacheException {
@@ -547,7 +547,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
 
   /**
    * Test EnableBridgeConflation region attribute
-   * @since 4.2
+   * @since GemFire 4.2
    */
   public void testEnableBridgeConflationAttribute() throws CacheException {
 
@@ -561,7 +561,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
 
   /**
    * Test EnableAsyncConflation region attribute
-   * @since 4.2
+   * @since GemFire 4.2
    */
   public void testEnableAsyncConflationAttribute() throws CacheException {
 
@@ -573,7 +573,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
     assertEquals(true, cache.getRegion("root").getAttributes().getEnableAsyncConflation());
   }
   /**
-   * @since 4.3
+   * @since GemFire 4.3
    */
   public void testDynamicRegionFactoryDefault() throws CacheException {
     CacheCreation cache = new CacheCreation();
@@ -613,7 +613,7 @@ public class CacheXml41DUnitTest extends CacheXml40DUnitTest
   }
 
   /**
-   * @since 4.3
+   * @since GemFire 4.3
    */
   public void testDynamicRegionFactoryDiskDir() throws CacheException {
     CacheCreation cache = new CacheCreation();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index f768218..0a275f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -33,7 +33,7 @@ import java.util.*;
  * Tests the declarative caching functionality introduced in GemFire
  * 5.0 (i.e. congo1). Don't be confused by the 45 in my name :-)
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
 
@@ -177,7 +177,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
 
   /**
    * Tests multiple cache listeners on one region
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void testMultipleCacheListener() throws CacheException {
     CacheCreation cache = new CacheCreation();
@@ -247,7 +247,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
 
   /**
    * Tests multiple transaction listeners
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void testMultipleTXListener() throws CacheException {
     CacheCreation cache = new CacheCreation();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml51DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml51DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml51DUnitTest.java
index a1f60ab..47f3825 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml51DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml51DUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * Tests the declarative caching functionality introduced in the GemFire
  * 5.0 (i.e. congo1). Don't be confused by the 45 in my name :-)
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 
 public class CacheXml51DUnitTest extends CacheXml45DUnitTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml55DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml55DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml55DUnitTest.java
index 808c3a4..315567f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml55DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml55DUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
  * Tests the declarative caching functionality introduced in the GemFire
  * 5.0 (i.e. congo1). Don't be confused by the 45 in my name :-)
  * 
- * @since 5.0
+ * @since GemFire 5.0
  */
 
 public class CacheXml55DUnitTest extends CacheXml51DUnitTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
index 5cda16b..2cb61f8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml57DUnitTest.java
@@ -64,7 +64,7 @@ import junit.framework.Assert;
 /**
  * Tests 5.7 cache.xml features.
  * 
- * @since 5.7
+ * @since GemFire 5.7
  */
 
 public class CacheXml57DUnitTest extends CacheXml55DUnitTest
@@ -405,7 +405,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
    * client subscription config in gemfire cache-server framework
    *
    * @throws CacheException
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void testBridgeAttributesRelatedToHAOverFlow() throws CacheException {
     CacheCreation cache = new CacheCreation();
@@ -643,7 +643,7 @@ public class CacheXml57DUnitTest extends CacheXml55DUnitTest
 
   /**
    * Test EnableSubscriptionConflation region attribute
-   * @since 5.7
+   * @since GemFire 5.7
    */
   public void testEnableSubscriptionConflationAttribute() throws CacheException {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
index d5123e7..f61158f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml58DUnitTest.java
@@ -49,7 +49,7 @@ import com.gemstone.gemfire.internal.cache.xmlcache.ResourceManagerCreation;
 /**
  * Tests 5.8 cache.xml features.
  * 
- * @since 5.8
+ * @since GemFire 5.8
  */
 
 public class CacheXml58DUnitTest extends CacheXml57DUnitTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
index 1a4bab7..992956a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml60DUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 /**
  * Tests 6.0 cache.xml features.
  * 
- * @since 6.0
+ * @since GemFire 6.0
  */
 
 public class CacheXml60DUnitTest extends CacheXml58DUnitTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml61DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml61DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml61DUnitTest.java
index acddbea..5bbdc59 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml61DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml61DUnitTest.java
@@ -53,7 +53,7 @@ import java.net.UnknownHostException;
 /**
  * Tests 6.1 cache.xml features.
  * 
- * @since 6.1
+ * @since GemFire 6.1
  */
 
 public class CacheXml61DUnitTest extends CacheXml60DUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
index 56376e0..7ad424a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml65DUnitTest.java
@@ -66,7 +66,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 /**
  * Tests 6.5 cache.xml features.
  * 
- * @since 6.5
+ * @since GemFire 6.5
  */
 public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
index 4c2f62d..8600214 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml66DUnitTest.java
@@ -47,7 +47,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
 /**
  * Tests 7.0 cache.xml feature : Fixed Partitioning.
  * 
- * @since 6.6
+ * @since GemFire 6.6
  */
 public class CacheXml66DUnitTest extends CacheXml65DUnitTest{
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
index b40af91..1b39b2c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml81DUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.IgnoredException;
  * should extend this test case where {@link #getUseSchema()} will return true.
  * 
  *
- * @since 8.1
+ * @since GemFire 8.1
  */
 public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
   private static final long serialVersionUID = 1L;
@@ -59,7 +59,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
    * Test extensions to
    * <code>cache<code> element.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public void testCacheExtension() {
     final CacheCreation cache = new CacheCreation();
@@ -91,7 +91,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
   /**
    * Test extensions to <code>region</code> element.
    * 
-   * @since 8.1
+   * @since GemFire 8.1
    */
   public void testRegionExtension() {
     final String regionName = "testRegionExtension";
@@ -129,7 +129,7 @@ public class CacheXml81DUnitTest extends CacheXml80DUnitTest {
    * Test {@link Locator} is used in {@link SAXParseException}.
    * Exercises {@link XmlParser#setDocumentLocator(Locator)}
    * 
-   * @since 8.2
+   * @since GemFire 8.2
    */
   @Test
   public void testLocatorInException() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
index 1cc9423..3db79b6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CachedAllEventsDUnitTest.java
@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
  * Make sure that create are distributed and done in
  * remote regions that are CACHED_ALL_EVENTS*.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 @Category(DistributedTest.class)
 public class CachedAllEventsDUnitTest extends JUnit4CacheTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
index 8a1c4ce..6b95b03 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CallbackArgDUnitTest.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test the getCallbackArgument in light of bug 34075.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class CallbackArgDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index 8530c0f..da3614c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;
 /**
  * Tests the ClientMembership API including ClientMembershipListener.
  *
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 public class ClientMembershipDUnitTest extends ClientServerTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
index 4bbc331..79fd543 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipSelectorDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache30;
 /**
  * Same as parent but uses selector in server
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class ClientMembershipSelectorDUnitTest extends ClientMembershipDUnitTest {
   public ClientMembershipSelectorDUnitTest(String name) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index cfb3e7d..325da80 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.cache.client.SubscriptionNotEnabledException;
 /**
  * Tests the client register interest
  *
- * @since 4.2.3
+ * @since GemFire 4.2.3
  */
 public class ClientRegisterInterestDUnitTest extends ClientServerTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
index 430ada3..d4d44c5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestSelectorDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.cache30;
 /**
  * Same as parent but uses selector in server
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class ClientRegisterInterestSelectorDUnitTest extends ClientRegisterInterestDUnitTest {
   public ClientRegisterInterestSelectorDUnitTest(String name) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
index 75132dc..8dba782 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerTestCase.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * test case was created by refactoring methods from ConnectionPoolDUnitTest into
  * this class.
  *
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 public class ClientServerTestCase extends CacheTestCase {
   
@@ -81,7 +81,7 @@ public class ClientServerTestCase extends CacheTestCase {
   /**
    * Starts a bridge server on the given port
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public int startBridgeServer(int port)
     throws IOException {
@@ -105,7 +105,7 @@ public class ClientServerTestCase extends CacheTestCase {
   /**
    * Stops the bridge server that serves up the given cache.
    *
-   * @since 4.0
+   * @since GemFire 4.0
    */
   public void stopBridgeServers(Cache cache) {
     CacheServer bridge = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
index aa327f8..0e7b193 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DiskRegionDUnitTest.java
@@ -60,7 +60,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * written to disk.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class DiskRegionDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 908bc96..810f1a7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed Ack Overflow Region with ConcurrencyChecksEnabled and OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedAckOverflowRegionCCEOffHeapDUnitTest extends DistributedAckOverflowRegionCCEDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index c1bd906..13ec4a3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed Ack Persistent Region with ConcurrencyChecksEnabled and OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedAckPersistentRegionCCEOffHeapDUnitTest extends DistributedAckPersistentRegionCCEDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index ffba1d3..77fcd83 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedAckRegionCCEOffHeapDUnitTest extends DistributedAckRegionCCEDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
index 1ad4869..b4517a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCompressionDUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 /**
  * Tests Distributed Ack Region with compression.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedAckRegionCompressionDUnitTest extends

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 865761f..30786e5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -35,7 +35,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This class tests the functionality of a cache {@link Region region}
  * that has a scope of {@link Scope#DISTRIBUTED_ACK distributed ACK}.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 08486d4..cfe7642 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed Ack Region with OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedAckRegionOffHeapDUnitTest extends DistributedAckRegionDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index 08a1fcb..d6c91a1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed Ack Region with ConcurrencyChecksEnabled and OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedNoAckRegionCCEOffHeapDUnitTest extends DistributedNoAckRegionCCEDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
index 64c4308..454d0ce 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionDUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * that has a scope of {@link Scope#DISTRIBUTED_NO_ACK distributed no
  * ACK}.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class DistributedNoAckRegionDUnitTest extends MultiVMRegionTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index 60b0fdf..30c4c3e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Distributed NoAck Region with OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class DistributedNoAckRegionOffHeapDUnitTest extends DistributedNoAckRegionDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
index 3bae952..472546f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DynamicRegionDUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test to make sure dynamic regions work
  *
- * @since 4.3
+ * @since GemFire 4.3
  */
 public class DynamicRegionDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index 6846aa8..39f0b1a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class GlobalRegionCCEOffHeapDUnitTest extends GlobalRegionCCEDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
index 0a3d3d8..8c40d6f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionDUnitTest.java
@@ -43,7 +43,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This class tests the functionality of a cache {@link Region region}
  * that has a scope of {@link Scope#GLOBAL global}.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class GlobalRegionDUnitTest extends MultiVMRegionTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index cb0e7ec..c178917 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Global Region with OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 @SuppressWarnings({ "deprecation", "serial" })
 public class GlobalRegionOffHeapDUnitTest extends GlobalRegionDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
index c07de86..e0358d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LRUEvictionControllerDUnitTest.java
@@ -54,7 +54,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * controller and its statistics.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class LRUEvictionControllerDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
index 188adbc..4f4a440 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/LocalRegionDUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.test.dunit.Assert;
  * though this test is a {@link com.gemstone.gemfire.test.dunit.DistributedTestCase}, it does
  * not perform any distribution.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class LocalRegionDUnitTest extends CacheListenerTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
index 51613fc..2e8716c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MemLRUEvictionControllerDUnitTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.internal.size.WellKnownClassSizer;
  * and its statistics.
  * 
  * 
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class MemLRUEvictionControllerDUnitTest extends CacheTestCase
 {
@@ -208,7 +208,7 @@ public class MemLRUEvictionControllerDUnitTest extends CacheTestCase
 
   /** Class used in testCustomObjectSizer
    * 
-   * @since 5.0
+   * @since GemFire 5.0
    */
   class CustomObjectSizer implements ObjectSizer
   {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index e112337..b5f4149 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -5448,7 +5448,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
    * Tests what happens when one VM attempts to read an object for
    * which it does not have a registered <code>DataSerializer</code>.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void testNoDataSerializer() {
     assertTrue(getRegionAttributes().getScope().isDistributed());
@@ -5600,7 +5600,7 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
    * Tests what happens when one VM attempts to read an object for
    * which it does not have a registered <code>Instantiator</code>.
    *
-   * @since 3.5
+   * @since GemFire 3.5
    */
   public void testNoInstantiator() {
     assertTrue(getRegionAttributes().getScope().isDistributed());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index af25980..5d53968 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
  * Tests the basic functionality of the lru eviction 
  * controller and its statistics using off-heap regions.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class OffHeapLRUEvictionControllerDUnitTest extends
     LRUEvictionControllerDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
index f433c24..d099761 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionCompressionDUnitTest.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.compression.SnappyCompressor;
 /**
  * Tests Partitioned Region with compression.
  * 
- * @since 8.0
+ * @since GemFire 8.0
  */
 public class PartitionedRegionCompressionDUnitTest extends
     PartitionedRegionDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
index e46a223..09084be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionDUnitTest.java
@@ -55,7 +55,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  * that has a scope of {@link Scope#DISTRIBUTED_ACK distributed ACK}
  * and {@link PartitionAttributes partition-attributes}.
  *
- * @since 5.1
+ * @since GemFire 5.1
  */
 public class PartitionedRegionDUnitTest extends MultiVMRegionTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
index 8876fd7..f4b5f12 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionMembershipListenerDUnitTest.java
@@ -34,7 +34,7 @@ import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.test.dunit.VM;
 
 /**
- * @since 6.0
+ * @since GemFire 6.0
  */
 public class PartitionedRegionMembershipListenerDUnitTest extends
     RegionMembershipListenerDUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index 897e9b9..3dbe5f9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests Partitioned Region with OffHeap memory.
  * 
- * @since 9.0
+ * @since Geode 1.0
  */
 public class PartitionedRegionOffHeapDUnitTest extends PartitionedRegionDUnitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
index 38be728..3508e7c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PreloadedRegionTestCase.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * This class tests the functionality of a cache {@link Region region}
  * that has a scope of {@link Scope#DISTRIBUTED_ACK distributed ACK}.
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class PreloadedRegionTestCase extends MultiVMRegionTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
index 7b0488a..3f66b32 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ProxyDUnitTest.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.test.dunit.VM;
  * Make sure that operations are distributed and done in
  * regions remote from a PROXY
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class ProxyDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 76c1b03..6a38b99 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Test to make sure message queuing works.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class QueueMsgDUnitTest extends ReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
index fe70582..588ed82 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionAttributesTestCase.java
@@ -32,7 +32,7 @@ import java.util.Properties;
  * AttributesMutator}.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class RegionAttributesTestCase
   extends RegionTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
index 4187aaf..c471ddf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionExpirationDUnitTest.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  * tests.
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public class RegionExpirationDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
index 2f6b7a5..8485d52 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionMembershipListenerDUnitTest.java
@@ -46,7 +46,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Test {@link RegionMembershipListener}
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RegionMembershipListenerDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
index 6bbee08..e639ce0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistAckDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.*;
  * Tests region reliability defined by MembershipAttributes using 
  * DISTRIBUTED_ACK scope.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RegionReliabilityDistAckDUnitTest extends RegionReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
index 31f0897..46b3f2e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityDistNoAckDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.*;
  * Tests region reliability defined by MembershipAttributes using 
  * DISTRIBUTED_NO_ACK scope.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RegionReliabilityDistNoAckDUnitTest extends RegionReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
index 4e3be2e..3e44012 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityGlobalDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.*;
  * Tests region reliability defined by MembershipAttributes using 
  * GLOBAL scope.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RegionReliabilityGlobalDUnitTest extends RegionReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
index dfb2470..98c2b6e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
@@ -39,7 +39,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests the functionality of the {@link RegionRoleListener} class.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RegionReliabilityListenerDUnitTest extends ReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index 30bf72c..86ed3a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 /**
  * Tests region reliability defined by MembershipAttributes.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public abstract class RegionReliabilityTestCase extends ReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
index 45cb8a5..ac3d721 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
@@ -78,7 +78,7 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
  *
  * TODO:davidw: Test {@link CacheStatistics}
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class RegionTestCase extends CacheTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
index e170a0a..4ebde70 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReliabilityTestCase.java
@@ -23,7 +23,7 @@ import java.util.*;
 /**
  * Provides functionality helpful to testing Reliability and RequiredRoles.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public abstract class ReliabilityTestCase extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
index 8700c7f..094f7e8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
 /**
  * Tests the functionality of the {@link RequiredRoles} class.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RequiredRolesDUnitTest extends ReliabilityTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
index d8530b9..0e805b9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
@@ -32,7 +32,7 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * Tests the performance of Regions when Roles are assigned.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class RolePerformanceDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index 2441256..0d99870 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -51,7 +51,7 @@ import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 /**
  * Test to make sure slow receiver queuing is working
  *
- * @since 4.2.1
+ * @since GemFire 4.2.1
  */
 @Category(DistributedTest.class)
 @Ignore("Test was disabled by renaming to DisabledTest")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
index 3af5447..b6bce88 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
@@ -22,7 +22,7 @@
  * <code>MultiVMRegionTestCase</code>.
  * 
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @see MultiVMRegionTestCase
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
index faf2873..4236dc8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXOrderDUnitTest.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test the order of operations done on the farside of a tx.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 public class TXOrderDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
index 7d969c8..b4bff79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXRestrictionsDUnitTest.java
@@ -20,7 +20,7 @@
  * <code>MultiVMRegionTestCase</code>.
  * 
  *
- * @since 4.0
+ * @since GemFire 4.0
  * @see MultiVMRegionTestCase
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheCallback.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheCallback.java
index 3f67027..d511604 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheCallback.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheCallback.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.test.dunit.WaitCriterion;
  *
  * @see #wasInvoked
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class TestCacheCallback implements CacheCallback {
   // differentiate between callback being closed and callback

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheListener.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheListener.java
index 9fca345..52a05bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheListener.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheListener.java
@@ -27,7 +27,7 @@ import java.util.*;
  *
  * @see #wasInvoked
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class TestCacheListener extends TestCacheCallback
   implements CacheListener {
@@ -52,7 +52,7 @@ public abstract class TestCacheListener extends TestCacheCallback
   }
   /**
    * Enables collection of event history.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void enableEventHistory() {
     if (this.eventHistory == null) {
@@ -61,7 +61,7 @@ public abstract class TestCacheListener extends TestCacheCallback
   }
   /**
    * Disables collection of events.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public void disableEventHistory() {
     this.eventHistory = null;
@@ -69,7 +69,7 @@ public abstract class TestCacheListener extends TestCacheCallback
   /**
    * Returns a copy of the list of events collected in this listener's history.
    * Also clears the current history.
-   * @since 5.0
+   * @since GemFire 5.0
    */
   public List getEventHistory() {
     if (this.eventHistory == null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheLoader.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheLoader.java
index 48e529d..86b2f12 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheLoader.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheLoader.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.*;
  * @see TestCacheWriter
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class TestCacheLoader extends TestCacheCallback
   implements CacheLoader {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheWriter.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheWriter.java
index dffae19..c1cc487 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheWriter.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestCacheWriter.java
@@ -27,7 +27,7 @@ import com.gemstone.gemfire.cache.*;
  * @see #wasInvoked
  *
  *
- * @since 3.0
+ * @since GemFire 3.0
  */
 public abstract class TestCacheWriter extends TestCacheCallback
   implements CacheWriter {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestDiskRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestDiskRegion.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestDiskRegion.java
index 2d1b25c..1c11f1e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestDiskRegion.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestDiskRegion.java
@@ -42,7 +42,7 @@ import com.gemstone.gemfire.internal.cache.lru.LRUStatistics;
  * A little test program for testing (and debugging) disk regions.
  *
  *
- * @since 3.2
+ * @since GemFire 3.2
  */
 public class TestDiskRegion {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestTransactionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestTransactionListener.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestTransactionListener.java
index 50b5767..b244b39 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestTransactionListener.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TestTransactionListener.java
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.cache.*;
  *
  * @see #wasInvoked
  *
- * @since 4.0
+ * @since GemFire 4.0
  */
 public abstract class TestTransactionListener extends TestCacheCallback
   implements TransactionListener {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
index 043b5ae..5f4debd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
@@ -48,7 +48,7 @@ import com.gemstone.gemfire.internal.util.IOUtils;
 import com.gemstone.gemfire.internal.util.StopWatch;
 
 /**
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class AbstractLauncherIntegrationTestCase {
   protected static final Logger logger = LogService.getLogger();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherServiceStatusTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherServiceStatusTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherServiceStatusTest.java
index 940802f..b753a45 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherServiceStatusTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherServiceStatusTest.java
@@ -40,7 +40,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
 /**
  * Tests marshaling of ServiceStatus to and from JSON.
  * 
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class AbstractLauncherServiceStatusTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
index 0ebd4b6..4111270 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
@@ -37,7 +37,7 @@ import com.gemstone.gemfire.test.junit.categories.UnitTest;
  * @see com.gemstone.gemfire.distributed.AbstractLauncher
  * @see org.junit.Assert
  * @see org.junit.Test
- * @since 7.0
+ * @since GemFire 7.0
  */
 @Category(UnitTest.class)
 public class AbstractLauncherTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLocatorLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLocatorLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLocatorLauncherIntegrationTestCase.java
index d419b61..545821e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLocatorLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLocatorLauncherIntegrationTestCase.java
@@ -36,7 +36,7 @@ import com.gemstone.gemfire.internal.DistributionLocator;
 import org.junit.runners.Parameterized;
 
 /**
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class AbstractLocatorLauncherIntegrationTestCase extends AbstractLauncherIntegrationTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
index 5f4fd6f..d4943a0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
@@ -33,7 +33,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.AbstractCacheServer;
 
 /**
- * @since 8.0
+ * @since GemFire 8.0
  */
 public abstract class AbstractServerLauncherIntegrationTestCase extends AbstractLauncherIntegrationTestCase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 372f006..7fd6df9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -45,7 +45,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Tests the functionality of the {@link DistributedMember} class.
  *
- * @since 5.0
+ * @since GemFire 5.0
  */
 @Category(DistributedTest.class)
 public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {