You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2014/06/20 02:13:50 UTC
git commit: ACCUMULO-2930: Update classes still using
AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 344b4d3a3 -> 8f1dc6528
ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f1dc652
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f1dc652
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f1dc652
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 8f1dc6528acb49ecb24b61b25fb3ebec066102f2
Parents: 344b4d3
Author: Dave Marion <dl...@hotmail.com>
Authored: Thu Jun 19 20:12:49 2014 -0400
Committer: Dave Marion <dl...@hotmail.com>
Committed: Thu Jun 19 20:12:49 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/LoginProperties.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f1dc652/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
index cf1a065..e1cbd0e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.security.handler.Authenticator;
-import org.apache.accumulo.start.classloader.AccumuloClassLoader;
+import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
/**
*
@@ -36,7 +36,7 @@ public class LoginProperties {
public static void main(String[] args) throws Exception {
AccumuloConfiguration config = ServerConfiguration.getSystemConfiguration(HdfsZooInstance.getInstance());
- Authenticator authenticator = AccumuloClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
+ Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
.asSubclass(Authenticator.class).newInstance();
List<Set<TokenProperty>> tokenProps = new ArrayList<Set<TokenProperty>>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f1dc652/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 67f2739..7eb9504 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -52,7 +52,7 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.start.classloader.AccumuloClassLoader;
+import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.accumulo.trace.instrument.Span;
import org.apache.accumulo.trace.thrift.RemoteSpan;
import org.apache.accumulo.trace.thrift.SpanReceiver.Iface;
@@ -183,7 +183,7 @@ public class TraceServer implements Watcher {
at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
} else {
Properties props = new Properties();
- AuthenticationToken token = AccumuloClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
+ AuthenticationToken token = AccumuloVFSClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
.newInstance();
int prefixLength = Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();