From 921a293e68dbc0cbb5be009d5f72cab9fcc1a33e Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Fri, 1 Jul 2016 16:59:27 +0900
Subject: [PATCH 1/5] Changed the default value of some configurations

---
 .../main/java/org/apache/zeppelin/server/ZeppelinServer.java  | 1 +
 .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 0ff0dc6ac63..9adbaad6609 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -50,6 +50,7 @@
 import javax.ws.rs.core.Application;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index 57de4a106be..e2673dfe590 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -466,7 +466,7 @@ public interface ConfigurationKeyPredicate {
    * Wrapper class.
    */
   public static enum ConfVars {
-    ZEPPELIN_HOME("zeppelin.home", "../"),
+    ZEPPELIN_HOME("zeppelin.home", "./"),
     ZEPPELIN_ADDR("zeppelin.server.addr", "0.0.0.0"),
     ZEPPELIN_PORT("zeppelin.server.port", 8080),
     ZEPPELIN_SERVER_CONTEXT_PATH("zeppelin.server.context.path", "/"),
@@ -479,7 +479,7 @@ public static enum ConfVars {
     ZEPPELIN_SSL_TRUSTSTORE_PATH("zeppelin.ssl.truststore.path", null),
     ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null),
     ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
-    ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/dist"),
+    ZEPPELIN_WAR("zeppelin.war", "zeppelin-web/dist"),
     ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"),
     ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter,"
         + "org.apache.zeppelin.spark.PySparkInterpreter,"

From d24b854453ac3219685d5cb77b8e8c0046f7bb4c Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Sun, 3 Jul 2016 00:44:59 +0900
Subject: [PATCH 2/5] Set some configuration to pass `mvn verify`

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 602b06e878f..573aab7992f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -532,6 +532,10 @@
             <encoding>UTF-8</encoding>
             <inputEncoding>UTF-8</inputEncoding>
             <outputEncoding>UTF-8</outputEncoding>
+            <systemPropertyVariables>
+              <ZEPPELIN_HOME>../</ZEPPELIN_HOME>
+              <ZEPPELIN_WAR>../zeppelin-web/dist</ZEPPELIN_WAR>
+            </systemPropertyVariables>
           </configuration>
           <!-- <excludes> <exclude>**/itest/**</exclude> </excludes> <executions>
             <execution> <id>surefire-itest</id> <phase>integration-test</phase> <goals>

From 161ffce73715dd283d9d45f51a9d4f24341d9de5 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Sun, 3 Jul 2016 00:47:11 +0900
Subject: [PATCH 3/5] Removed unused import

---
 .../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index 9adbaad6609..0ff0dc6ac63 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -50,7 +50,6 @@
 import javax.ws.rs.core.Application;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;

From eb1f733f3b2a4658fe1ee9c6dc4d7b3410aa4399 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Sun, 3 Jul 2016 02:07:03 +0900
Subject: [PATCH 4/5] Fixed to pass the tests

---
 pom.xml                                                       | 4 ----
 .../java/org/apache/zeppelin/rest/AbstractTestRestApi.java    | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 573aab7992f..602b06e878f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -532,10 +532,6 @@
             <encoding>UTF-8</encoding>
             <inputEncoding>UTF-8</inputEncoding>
             <outputEncoding>UTF-8</outputEncoding>
-            <systemPropertyVariables>
-              <ZEPPELIN_HOME>../</ZEPPELIN_HOME>
-              <ZEPPELIN_WAR>../zeppelin-web/dist</ZEPPELIN_WAR>
-            </systemPropertyVariables>
           </configuration>
           <!-- <excludes> <exclude>**/itest/**</exclude> </excludes> <executions>
             <execution> <id>surefire-itest</id> <phase>integration-test</phase> <goals>
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
index 7bedd284c59..ada2ef8170b 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -36,6 +36,7 @@
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.dep.Dependency;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
 import org.apache.zeppelin.interpreter.InterpreterOption;
@@ -98,6 +99,8 @@ public void run() {
 
   protected static void startUp() throws Exception {
     if (!wasRunning) {
+      System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HOME.getVarName(), "../");
+      System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_WAR.getVarName(), "../zeppelin-web/dist");
       LOG.info("Staring test Zeppelin up...");
       executor = Executors.newSingleThreadExecutor();
       executor.submit(server);

From 375a95b477ade4bf910cf3ab78492c6ca641ac7a Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Sun, 3 Jul 2016 02:33:47 +0900
Subject: [PATCH 5/5] Fixed to pass the tests

---
 .../java/org/apache/zeppelin/integration/AuthenticationIT.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
index 5f17b03493b..671b213b471 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
@@ -77,6 +77,7 @@ public static void startUp() {
     }
 
     try {
+      System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HOME.getVarName(), "../");
       ZeppelinConfiguration conf = ZeppelinConfiguration.create();
       File file = new File(conf.getShiroPath());
       originalShiro = StringUtils.join(FileUtils.readLines(file, "UTF-8"), "\n");