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

[30/50] [abbrv] incubator-geode git commit: GEODE-1316: Changing @since tags to @GemFire or @Geode

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8eac0fa8/geode-core/src/main/java/com/gemstone/gemfire/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 {