Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CB4BF9039 for ; Thu, 16 May 2013 18:44:21 +0000 (UTC) Received: (qmail 51359 invoked by uid 500); 16 May 2013 18:44:21 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 51335 invoked by uid 500); 16 May 2013 18:44:21 -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 51328 invoked by uid 99); 16 May 2013 18:44:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 18:44:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 18:44:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3F12C23888D2; Thu, 16 May 2013 18:44:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483501 - in /accumulo/branches/1.5: start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Date: Thu, 16 May 2013 18:44:00 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130516184400.3F12C23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Thu May 16 18:43:59 2013 New Revision: 1483501 URL: http://svn.apache.org/r1483501 Log: ACCUMULO-1274 classpath command shows two java configured classpaths before showing Accumulo configured classpaths. Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java?rev=1483501&r1=1483500&r2=1483501&view=diff ============================================================================== --- accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java (original) +++ accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java Thu May 16 18:43:59 2013 @@ -305,10 +305,10 @@ public class AccumuloVFSClassLoader { switch (level) { case 1: - classLoaderDescription = level + ": Java System Classloader (loads Java)"; + classLoaderDescription = level + ": Java System Classloader (loads Java system resources)"; break; case 2: - classLoaderDescription = level + ": Accumulo Start Classloader (loads the classloader)"; + classLoaderDescription = level + ": Java Classloader (loads everything defined by java classpath)"; break; case 3: classLoaderDescription = level + ": Accumulo Classloader (loads everything defined by general.classpaths)"; Modified: accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1483501&r1=1483500&r2=1483501&view=diff ============================================================================== --- accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original) +++ accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Thu May 16 18:43:59 2013 @@ -394,7 +394,7 @@ public class ShellServerTest { @Test(timeout = 30000) public void classpath() throws Exception { // classpath - exec("classpath", true, "Level 2: Accumulo Start Classloader (loads the classloader) URL classpath items are", true); + exec("classpath", true, "Level 2: Java Classloader (loads everything defined by java classpath) URL classpath items are", true); } @Test(timeout = 30000)