* fix in core-site.xml property

* change hcfs test harnace to load filesystem based on hadoop configuration files (now loads per settings in conf/core-site.xml vs env variables).
* removed dead code

Author: childsb

conf/core-site.xml

@@ -21,7 +21,7 @@
 
   <property>
     <name>fs.default.name</name>
-    <value>glusterfs:///<</value>
+    <value>glusterfs:///</value>
   </property>
 
 

pom.xml

@@ -46,35 +46,12 @@
 	</dependency>
   </dependencies>
   <build>
+       <testResources>
+            <testResource>
+                <directory>conf</directory>
+            </testResource>
+        </testResources>
     <plugins>
-      <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.3</version>
-		<configuration>
-			<!--  
-				run "export GLUSTER_MOUNT=/mnt/glusterfs
-				     export HCFS_FILE_SYSTEM_CONNECTOR=org.gluster.test.GlusterFileSystemTestConnector
-				     export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystem" 
-			-->
-		    <systemProperties>
-				          <property>
-				             <name>GLUSTER_MOUNT</name>
-				             <value>${GLUSTER_MOUNT}</value>
-				          </property>
-				          <property>
-				             <name>HCFS_CLASSNAME</name>
-				             <value>${HCFS_CLASSNAME}</value>
-				          </property>
-				          <property>
-				             <name>HCFS_FILE_SYSTEM_CONNECTOR</name>
-				             <value>${HCFS_FILE_SYSTEM_CONNECTOR}</value>
-				          </property>
-				          
-			</systemProperties>
-		 </configuration>
- 	 </plugin>
-		      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -85,7 +62,7 @@
         </configuration>
       </plugin>
 
-<plugin>
+		<plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
                 <version>2.1.4</version>

src/test/java/org/apache/hadoop/fs/test/connector/HcfsTestConnector.java

@@ -1,33 +1,29 @@
 package org.apache.hadoop.fs.test.connector;
 
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 
+
 /*
  * Generic HCFS file system test connector.
  * This test connector takes a fully qualified o.a.h.f.FileSystem implementor class 
  * as an environment variable.
  * 
  */
-public class HcfsTestConnector implements HcfsTestConnectorInterface{
-	 
-	public Configuration createConfiguration(){
-		return new Configuration();
-	}
-	   
-    public FileSystem create(String HcfsClassName) throws IOException{
-    	try {
-    		FileSystem hcfs = (FileSystem)Class.forName(HcfsClassName).newInstance();
-			hcfs.initialize(hcfs.getUri(), createConfiguration());
-			return hcfs;
-		} catch (Exception e) {
-			throw new RuntimeException("Cannont instatiate HCFS. Error:\n " + e);
-		} 
-	}
+public class HcfsTestConnector implements HcfsTestConnectorInterface {
+
+    public Configuration createConfiguration(){
+        Configuration c = new Configuration();
+        InputStream config = HcfsTestConnector.class.getClassLoader().getResourceAsStream("core-site.xml");
+        c.addResource(config);
+
+        return c;
+    }
 
-	public FileSystem create() throws IOException {
-		return create(System.getProperty("HCFS_CLASSNAME"));
-	}
+    public FileSystem create() throws IOException{
+        return FileSystem.get(createConfiguration());
+    }
 }

src/test/java/org/apache/hadoop/fs/test/connector/HcfsTestConnectorFactory.java

@@ -5,7 +5,12 @@ public class HcfsTestConnectorFactory {
 
 	/* Loads an HCFS file system adapter via environment variable */
 	public static HcfsTestConnectorInterface getHcfsTestConnector() throws RuntimeException{
-		return getHcfsTestConnector(System.getProperty("HCFS_FILE_SYSTEM_CONNECTOR"));
+	    String testConnector = System.getProperty("HCFS_FILE_SYSTEM_CONNECTOR");
+	    if(testConnector==null || "".equals(testConnector)){
+	        testConnector = HcfsTestConnector.class.getCanonicalName();	    
+	     }
+	    
+		return getHcfsTestConnector(testConnector);
 	}
 
 	public static HcfsTestConnectorInterface getHcfsTestConnector(String hcfsName) throws RuntimeException{

src/test/java/org/apache/hadoop/fs/test/connector/glusterfs/GlusterFileSystemTestConnector.java

@@ -2,19 +2,7 @@
 
 # this could be conditionally set.  it may be set higher up as part of the global env variables.
 rm -rf target/
-export GLUSTER_MOUNT=/mnt/glusterfs
-export HCFS_FILE_SYSTEM_CONNECTOR=org.apache.hadoop.fs.test.connector.glusterfs.GlusterFileSystemTestConnector
-export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystem
-rm -rf target/
-rm -rf /mnt/glusterfs/*
 # runs in debug mode.
-# mvn package -Dmaven.surefire.debug 
-mvn package
-# export HCFS_CLASSNAME=org.apache.hadoop.fs.glusterfs.GlusterFileSystemCRC
-
-mvn package
-
-unset HCFS_FILE_SYSTEM_CONNECTOR
-unset HCFS_CLASSNAME
+mvn package -Dmaven.surefire.debug