accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [1/3] git commit: ACCUMULO-2317 Missed these errors
Date Tue, 04 Feb 2014 00:11:14 GMT
Updated Branches:
  refs/heads/master 3fd5fa967 -> d13cc7675


ACCUMULO-2317 Missed these errors


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da906f04
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da906f04
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da906f04

Branch: refs/heads/master
Commit: da906f04f608b11122140a4a29bbb1f9fbde5387
Parents: b33fbf4
Author: John Vines <vines@apache.org>
Authored: Mon Feb 3 19:02:29 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Mon Feb 3 19:02:29 2014 -0500

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java | 5 +++--
 .../org/apache/accumulo/core/util/shell/ShellOptionsJC.java     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da906f04/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
index c43b121..588dcdb 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
@@ -25,10 +25,10 @@ import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.ClientConfiguration;
+import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
 import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
@@ -43,6 +43,7 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.trace.instrument.Trace;
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.Job;
@@ -221,7 +222,7 @@ public class ClientOpts extends Help {
 
     ClientConfiguration clientConfig;
     try {
-      clientConfig = ClientConfiguration.loadDefault(clientConfigFile);
+      clientConfig = new ClientConfiguration(new PropertiesConfiguration(clientConfigFile));
     } catch (Exception e) {
       throw new IllegalArgumentException(e);
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/da906f04/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
index 85e77e0..7032e0d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.ClientConfiguration;
 import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.log4j.Logger;
 
 import com.beust.jcommander.DynamicParameter;
@@ -265,7 +266,7 @@ public class ShellOptionsJC {
 
   public ClientConfiguration getClientConfiguration() throws ConfigurationException,
   FileNotFoundException {
-    ClientConfiguration clientConfig = ClientConfiguration.loadDefault(getClientConfigFile());
+    ClientConfiguration clientConfig = new ClientConfiguration(new PropertiesConfiguration(getClientConfigFile()));
     if (useSsl()) {
       clientConfig.setProperty(ClientProperty.INSTANCE_RPC_SSL_ENABLED, "true");
     }


Mime
View raw message