From 5760f83dafbd5bfcbe7ed9315061e6f1c74edcfa Mon Sep 17 00:00:00 2001
From: Calvin Jia <jia.calvin@gmail.com>
Date: Wed, 29 Apr 2015 21:29:09 -0700
Subject: [PATCH] Update poms and libexec for s3, add s3 test underfs

---
 client/pom.xml                                | 11 +++++
 libexec/tachyon-config.sh                     |  2 +-
 underfs/s3/pom.xml                            |  2 +-
 .../underfs/s3/S3UnderStorageCluster.java     | 48 +++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 underfs/s3/src/test/java/tachyon/underfs/s3/S3UnderStorageCluster.java

diff --git a/client/pom.xml b/client/pom.xml
index 8cdb873a9856..c9c3490e5964 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -105,6 +105,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.tachyonproject</groupId>
+      <artifactId>tachyon-underfs-s3</artifactId>
+      <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.tachyonproject</groupId>
+          <artifactId>tachyon</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/libexec/tachyon-config.sh b/libexec/tachyon-config.sh
index df368182cd49..75e4e041170d 100755
--- a/libexec/tachyon-config.sh
+++ b/libexec/tachyon-config.sh
@@ -26,7 +26,7 @@ if [ -z "$TACHYON_SYSTEM_INSTALLATION" ]; then
   export TACHYON_HOME=${TACHYON_PREFIX}
   export TACHYON_CONF_DIR="$TACHYON_HOME/conf"
   export TACHYON_LOGS_DIR="$TACHYON_HOME/logs"
-  export TACHYON_JARS="$TACHYON_HOME/core/target/tachyon-${VERSION}-jar-with-dependencies.jar:$TACHYON_HOME/underfs/hdfs/target/tachyon-underfs-hdfs-${VERSION}.jar:$TACHYON_HOME/underfs/glusterfs/target/tachyon-underfs-glusterfs-${VERSION}.jar:$TACHYON_HOME/examples/target/tachyon-examples-${VERSION}.jar:$TACHYON_HOME/shell/target/tachyon-shell-${VERSION}.jar"
+  export TACHYON_JARS="$TACHYON_HOME/core/target/tachyon-${VERSION}-jar-with-dependencies.jar:$TACHYON_HOME/underfs/hdfs/target/tachyon-underfs-hdfs-${VERSION}.jar:$TACHYON_HOME/underfs/glusterfs/target/tachyon-underfs-glusterfs-${VERSION}.jar:$TACHYON_HOME/underfs/s3/target/tachyon-underfs-s3-${VERSION}.jar:$TACHYON_HOME/examples/target/tachyon-examples-${VERSION}.jar:$TACHYON_HOME/shell/target/tachyon-shell-${VERSION}.jar"
   export JAVA="$JAVA_HOME/bin/java"
 fi
 
diff --git a/underfs/s3/pom.xml b/underfs/s3/pom.xml
index 2cf021a2f07b..06e8225652a5 100644
--- a/underfs/s3/pom.xml
+++ b/underfs/s3/pom.xml
@@ -108,7 +108,7 @@
             <dependency>org.tachyonproject:tachyon</dependency>
           </dependenciesToScan>
           <systemPropertyVariables>
-            <ufs>tachyon.underfs.hdfs.LocalMiniDFSCluster</ufs>
+            <ufs>tachyon.underfs.s3.S3UnderStorageCluster</ufs>
           </systemPropertyVariables>
         </configuration>
         <executions>
diff --git a/underfs/s3/src/test/java/tachyon/underfs/s3/S3UnderStorageCluster.java b/underfs/s3/src/test/java/tachyon/underfs/s3/S3UnderStorageCluster.java
new file mode 100644
index 000000000000..43e3849e1817
--- /dev/null
+++ b/underfs/s3/src/test/java/tachyon/underfs/s3/S3UnderStorageCluster.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the University of California, Berkeley under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package tachyon.underfs.s3;
+
+import java.io.IOException;
+
+import tachyon.conf.TachyonConf;
+import tachyon.underfs.UnderFileSystemCluster;
+
+/**
+ * This class will use Amazon S3 as the backing store.
+ */
+public class S3UnderStorageCluster extends UnderFileSystemCluster {
+
+  public S3UnderStorageCluster(String baseDir, TachyonConf tachyonConf) {
+    super(baseDir, tachyonConf);
+    mBaseDir = "s3n://calvin-s3-test/testdir";
+  }
+
+  @Override
+  public String getUnderFilesystemAddress() {
+    return mBaseDir;
+  }
+
+  @Override
+  public boolean isStarted() {
+    return true;
+  }
+
+  @Override
+  public void shutdown() throws IOException {}
+
+  @Override
+  public void start() throws IOException {}
+}