svn commit: r1415296 - in /accumulo/trunk: pom.xml start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java

[billie]

Author: billie
Date: Thu Nov 29 17:43:57 2012
New Revision: 1415296

URL: http://svn.apache.org/viewvc?rev=1415296&view=rev
Log:
ACCUMULO-881 fixed unit test failures due to ACCUMULO_HOME issue

Modified:
    accumulo/trunk/pom.xml
    
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1415296&r1=1415295&r2=1415296&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Thu Nov 29 17:43:57 2012
@@ -197,7 +197,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <environmentVariables>
-             <ACCUMULO_HOME>../test/src/test/resources</ACCUMULO_HOME>
+             <ACCUMULO_HOME>..</ACCUMULO_HOME>
           </environmentVariables>
         </configuration>
       </plugin>

Modified: 
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java?rev=1415296&r1=1415295&r2=1415296&view=diff
==============================================================================
--- 
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
 (original)
+++ 
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/vfs/AccumuloVFSClassLoader.java
 Thu Nov 29 17:43:57 2012
@@ -109,7 +109,9 @@ public class AccumuloVFSClassLoader {
       }
     }
     try {
-      ACC_CONF.addResource(new File(SITE_CONF).toURI().toURL());
+      File siteFile = new File(SITE_CONF);
+      if (siteFile.exists())
+        ACC_CONF.addResource(siteFile.toURI().toURL());
     } catch (MalformedURLException e) {
       throw new RuntimeException("Unable to create configuration from 
accumulo-site file: " + SITE_CONF, e);
     }