Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5C4012009F3 for ; Fri, 20 May 2016 19:11:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5AE0F160A2B; Fri, 20 May 2016 17:11:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A4C721609AE for ; Fri, 20 May 2016 19:11:03 +0200 (CEST) Received: (qmail 20652 invoked by uid 500); 20 May 2016 17:11:01 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 20627 invoked by uid 99); 20 May 2016 17:11:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2016 17:11:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8A877DFADE; Fri, 20 May 2016 17:11:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dlmarion@apache.org To: commits@accumulo.apache.org Date: Fri, 20 May 2016 17:11:02 -0000 Message-Id: In-Reply-To: <3a4ec675256f4b948aef03f70c979e07@git.apache.org> References: <3a4ec675256f4b948aef03f70c979e07@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Fri, 20 May 2016 17:11:04 -0000 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/b3df3543 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3df3543 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3df3543 Branch: refs/heads/master Commit: b3df354344e9a287d2cac28d9bcc073f225d8516 Parents: 7cffcfc b363e88 Author: Dave Marion Authored: Fri May 20 12:48:16 2016 -0400 Committer: Dave Marion Committed: Fri May 20 12:48:16 2016 -0400 ---------------------------------------------------------------------- pom.xml | 2 +- .../classloader/vfs/AccumuloVFSClassLoader.java | 4 +- .../vfs/providers/HdfsFileAttributes.java | 59 ----- .../providers/HdfsFileContentInfoFactory.java | 50 ---- .../vfs/providers/HdfsFileObject.java | 240 ------------------- .../vfs/providers/HdfsFileProvider.java | 65 ----- .../vfs/providers/HdfsFileSystem.java | 126 ---------- .../providers/HdfsFileSystemConfigBuilder.java | 45 ---- .../vfs/providers/HdfsRandomAccessContent.java | 228 ------------------ .../classloader/vfs/providers/package.html | 19 -- .../providers/ReadOnlyHdfsFileProviderTest.java | 2 + .../apache/accumulo/test/AccumuloDFSBase.java | 2 +- 12 files changed, 6 insertions(+), 836 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3df3543/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3df3543/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 4df3f40,98b3b54..8c7067f --- 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 @@@ -40,10 -38,11 +38,12 @@@ 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/b3df3543/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java ----------------------------------------------------------------------