accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] branch 1.7 updated: ACCUMULO-4170 Clarify ClientConfiguration javadocs
Date Fri, 13 Oct 2017 15:38:27 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch 1.7
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.7 by this push:
     new 4750b88  ACCUMULO-4170 Clarify ClientConfiguration javadocs
4750b88 is described below

commit 4750b880f05b0e584db108598fc9ace42e40dafa
Author: Mark Owens <jmarkowe@gmail.com>
AuthorDate: Fri Oct 13 11:20:54 2017 -0400

    ACCUMULO-4170 Clarify ClientConfiguration javadocs
    
    Updated the javadoc information for the loadDefaults() method.
    Specifically reworked the default search path information to be
    displayed as a list rather than inline, thereby easing readability.
    Reworded a few of the sentences.
    
    Closes #306
---
 .../accumulo/core/client/ClientConfiguration.java  | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 1b9b380..6e2923a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -199,13 +199,25 @@ public class ClientConfiguration extends CompositeConfiguration {
   }
 
   /**
-   * Attempts to load a configuration file from the system. Uses the "ACCUMULO_CLIENT_CONF_PATH"
environment variable, split on File.pathSeparator, for a list
-   * of target files. If not set, uses the following in this order- ~/.accumulo/config $ACCUMULO_CONF_DIR/client.conf
-OR- $ACCUMULO_HOME/conf/client.conf
-   * (depending on whether $ACCUMULO_CONF_DIR is set) /etc/accumulo/client.conf
-   *
-   * A client configuration will then be read from each location using PropertiesConfiguration
to construct a configuration. That means the latest item will be
-   * the one in the configuration.
-   *
+   * Attempts to load a configuration file from the system using the default search paths.
Uses the <em>ACCUMULO_CLIENT_CONF_PATH</em> environment variable,
+   * split on <em>File.pathSeparator</em>, for a list of target files.
+   * <p>
+   * If <em>ACCUMULO_CLIENT_CONF_PATH</em> is not set, uses the following in
this order:
+   * <ul>
+   * <li>~/.accumulo/config
+   * <li>either:
+   * <ul>
+   * <li><em>$ACCUMULO_CONF_DIR</em>/client.conf, if <em>$ACCUMULO_CONF_DIR</em>
is defined.
+   * <li><em>$ACCUMULO_HOME</em>/conf/client.conf, otherwise.
+   * </ul>
+   * <li>/etc/accumulo/client.conf
+   * <li>/etc/accumulo/conf/client.conf
+   * </ul>
+   * <p>
+   * A client configuration will then be read from each location using <em>PropertiesConfiguration</em>
to construct a configuration. That means the latest item
+   * will be the one in the configuration.
+   * <p>
+   * 
    * @see PropertiesConfiguration
    * @see File#pathSeparator
    */

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

Mime
View raw message