Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5b1db01d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b1db01d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b1db01d Branch: refs/heads/1.8 Commit: 5b1db01d63ccc7c2d530fc5d87bfce9027627440 Parents: b3df354 ec469e9 Author: Dave Marion <dlmar...@apache.org> Authored: Mon May 23 09:39:39 2016 -0400 Committer: Dave Marion <dlmar...@apache.org> Committed: Mon May 23 09:39:39 2016 -0400 ---------------------------------------------------------------------- pom.xml | 2 +- .../classloader/vfs/AccumuloVFSClassLoader.java | 4 +- .../vfs/providers/HdfsFileAttributes.java | 59 ++++ .../providers/HdfsFileContentInfoFactory.java | 49 +++ .../vfs/providers/HdfsFileObject.java | 303 +++++++++++++++++ .../vfs/providers/HdfsFileProvider.java | 75 +++++ .../vfs/providers/HdfsFileSystem.java | 137 ++++++++ .../providers/HdfsFileSystemConfigBuilder.java | 45 +++ .../vfs/providers/HdfsRandomAccessContent.java | 329 +++++++++++++++++++ .../classloader/vfs/providers/package.html | 19 ++ .../providers/ReadOnlyHdfsFileProviderTest.java | 2 - .../apache/accumulo/test/AccumuloDFSBase.java | 2 +- 12 files changed, 1020 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b1db01d/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b1db01d/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java ---------------------------------------------------------------------- diff --cc start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java index 8c7067f,38d7469..4df3f40 --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java @@@ -38,12 -40,9 +40,10 @@@ import org.apache.commons.vfs2.impl.Def import org.apache.commons.vfs2.impl.FileContentInfoFilenameFactory; import org.apache.commons.vfs2.impl.VFSClassLoader; import org.apache.commons.vfs2.provider.FileReplicator; - import org.apache.commons.vfs2.provider.hdfs.HdfsFileObject; - import org.apache.commons.vfs2.provider.hdfs.HdfsFileProvider; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class builds a hierarchy of Classloaders in the form of: http://git-wip-us.apache.org/repos/asf/accumulo/blob/5b1db01d/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java ----------------------------------------------------------------------
