zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jongy...@apache.org
Subject zeppelin git commit: [MINOR] Enable launching in debug mode
Date Mon, 04 Jul 2016 14:11:01 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master a7a653999 -> ebe885572


[MINOR] Enable launching in debug mode

### What is this PR for?
Running ZeppelinServer.main normally. It will enable user to debug ZeppelinServer easily.

### What type of PR is it?
[Bug Fix]

### Todos
* [x] - Fix configuration values

### What is the Jira issue?
N/A

### How should this be tested?
- mvn clean package -DskipTests
- Debug ZeppelinServer in your IDE

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Jongyoul Lee <jongyoul@gmail.com>

Closes #1112 from jongyoul/minor-enable-launch-z-debugger-mode and squashes the following
commits:

375a95b [Jongyoul Lee] Fixed to pass the tests
eb1f733 [Jongyoul Lee] Fixed to pass the tests
161ffce [Jongyoul Lee] Removed unused import
d24b854 [Jongyoul Lee] Set some configuration to pass `mvn verify`
921a293 [Jongyoul Lee] Changed the default value of some configurations


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ebe88557
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ebe88557
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ebe88557

Branch: refs/heads/master
Commit: ebe885572e5a6670c57bc11ce3e89b73bcb75dce
Parents: a7a6539
Author: Jongyoul Lee <jongyoul@gmail.com>
Authored: Sun Jul 3 02:33:47 2016 +0900
Committer: Jongyoul Lee <jongyoul@apache.org>
Committed: Mon Jul 4 23:10:51 2016 +0900

----------------------------------------------------------------------
 .../java/org/apache/zeppelin/integration/AuthenticationIT.java   | 1 +
 .../test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java  | 3 +++
 .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java     | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ebe88557/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
----------------------------------------------------------------------
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 5f17b03..671b213 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 class AuthenticationIT extends AbstractZeppelinIT {
     }
 
     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");

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ebe88557/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
----------------------------------------------------------------------
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 7bedd28..ada2ef8 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.GetMethod;
 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 abstract class AbstractTestRestApi {
 
   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);

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ebe88557/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
----------------------------------------------------------------------
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 57de4a1..e2673df 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 class ZeppelinConfiguration extends XMLConfiguration {
    * 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 class ZeppelinConfiguration extends XMLConfiguration {
     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,"


Mime
View raw message