geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [13/32] incubator-geode git commit: GEODE-1377: More changes to Javadoc removing DistributedSystem documentation links
Date Tue, 05 Jul 2016 23:15:36 GMT
GEODE-1377: More changes to Javadoc removing DistributedSystem documentation links


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2f6dcec4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2f6dcec4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2f6dcec4

Branch: refs/heads/feature/GEODE-1571
Commit: 2f6dcec4f3f452770d1044db1fb1c4942bdf4ae8
Parents: 96f3af9
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Mon Jul 4 09:42:14 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Mon Jul 4 09:42:14 2016 +1000

----------------------------------------------------------------------
 .../admin/jmx/internal/AgentConfigImpl.java     | 29 --------------------
 .../cache/client/ClientCacheFactory.java        |  7 ++---
 .../gemfire/distributed/AbstractLauncher.java   |  4 ---
 .../gemfire/distributed/LocatorLauncher.java    |  2 +-
 .../gemfire/distributed/ServerLauncher.java     |  2 +-
 5 files changed, 5 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f6dcec4/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 6c24816..a71c479 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
@@ -749,35 +749,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
   }
 
 
-  /* return a string with the given locator's distributed system property
-      settings */
-  /*public String getdsPropertiesString(DistributionLocatorConfig locator) {
-    Properties props = locator.getDistributedSystemProperties();
-    if (props != null) {
-      final StringBuffer sb = new StringBuffer(30);
-      OutputStream os = new OutputStream() {
-        @Override
-        public void write(int i) {
-          sb.append((char)i);
-        }
-      };
-      try {
-        props.store(os, "");
-        os.flush();
-      } catch (java.io.IOException io) {
-        getLogWriter().warning(io);
-      } finally {
-        try {
-          os.close();
-        } catch (IOException e) {
-          getLogWriter().warning(e);
-        }
-      }
-      return sb.toString();
-    }
-    return "";
-  }*/
-
   // -------------------------------------------------------------------------
   //   Agent specific properties
   // -------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f6dcec4/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 19cc8f5..96dcde3 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
@@ -36,8 +36,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_POR
 /**
  * Factory class used to create the singleton {@link ClientCache client cache} and connect
to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a
peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.
  * <p> Once the factory has been configured using its set* methods you produce a {@link
ClientCache} by calling the {@link #create} method.
- * The
- * <a href="../distribution/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+ * The {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CACHE_XML_FILE}
  * property can be used to specify a cache.xml file to initialize the cache with.
  * The contents of this file must comply with the
  * <code>"doc-files/cache8_0.dtd"</code> file and the top level element must
be a <code>client-cache</code> element.
@@ -139,7 +138,7 @@ public class ClientCacheFactory {
    *
    * @param props The initial gemfire properties to be used.
    *              These properties can be overridden using the {@link #set} method
-   *              For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.DistributedSystem}.
+   *              For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.ConfigurationProperties}.
    */
   public ClientCacheFactory(Properties props) {
     if (props == null) {
@@ -150,7 +149,7 @@ public class ClientCacheFactory {
 
   /**
    * Sets a gemfire property that will be used when creating the ClientCache.
-   * For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.DistributedSystem}.
+   * For a full list of valid gemfire properties see {@link com.gemstone.gemfire.distributed.ConfigurationProperties}.
    *
    * @param name  the name of the gemfire property
    * @param value the value of the gemfire property

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f6dcec4/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 7fccfb1..77e360b 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
@@ -279,7 +279,6 @@ public abstract class AbstractLauncher<T extends Comparable<T>>
implements Runna
    * @see java.util.Properties
    */
   protected Properties getDistributedSystemProperties(final Properties defaults) {
-    //Properties distributedSystemProperties = new Properties(defaults);
     final Properties distributedSystemProperties = new Properties();
 
     if (defaults != null) {
@@ -290,9 +289,6 @@ public abstract class AbstractLauncher<T extends Comparable<T>>
implements Runna
       distributedSystemProperties.setProperty(NAME, getMemberName());
     }
 
-    // Set any other GemFire Distributed System/Distribution Config directory-based properties
as necessary
-    //distributedSystemProperties.setProperty(DistributionConfig.LICENSE_WORKING_DIR, getWorkingDirectory());
-
     return distributedSystemProperties;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f6dcec4/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 1b7316a..81d874d 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
@@ -1675,7 +1675,7 @@ public final class LocatorLauncher extends AbstractLauncher<String>
{
     /**
      * Sets a GemFire Distributed System Property.
      *
-     * @param propertyName a String indicating the name of the GemFire Distributed System
property.
+     * @param propertyName a String indicating the name of the GemFire Distributed System
property as described in {@link ConfigurationProperties}
      * @param propertyValue a String value for the GemFire Distributed System property.
      * @return this Builder instance.
      */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f6dcec4/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 8f30390..cce482a 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
@@ -2174,7 +2174,7 @@ public class ServerLauncher extends AbstractLauncher<String> {
     /**
      * Sets a GemFire Distributed System Property.
      *
-     * @param propertyName a String indicating the name of the GemFire Distributed System
property.
+     * @param propertyName a String indicating the name of the GemFire Distributed System
property as described in {@link ConfigurationProperties}
      * @param propertyValue a String value for the GemFire Distributed System property.
      * @return this Builder instance.
      */


Mime
View raw message