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

[kturner]

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)