Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN_CONTEXT_PATH is now ZEPPELIN_SERVER_CONTEXT_PATH

Browse source
This commit is contained in:
Eric Charles 2015-11-06 17:18:47 +01:00
parent 9095d5d3b5
commit 54f6b071fb
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/install/install.md
View file

@ -83,7 +83,7 @@ Configuration can be done by both environment variable(conf/zeppelin-env.sh) and
<td>Zeppelin server port. Note that port+1 is used for web socket</td>
</tr>
<tr>
<td>ZEPPELIN_CONTEXT_PATH</td>
<td>ZEPPELIN_SERVER_CONTEXT_PATH</td>
<td>zeppelin.server.context.path</td>
<td>/</td>
<td>Context Path of the Web Application</td>

6
zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
View file

@ -170,7 +170,7 @@ public class ZeppelinServer extends Application {
ServletContextHandler.SESSIONS);
cxfContext.setSessionHandler(new SessionHandler());
cxfContext.setContextPath(conf.getContextPath());
cxfContext.setContextPath(conf.getServerContextPath());
cxfContext.addServlet(servletHolder, "/ws/*");
cxfContext.addFilter(new FilterHolder(CorsFilter.class), "/*",
EnumSet.allOf(DispatcherType.class));
@ -218,7 +218,7 @@ public class ZeppelinServer extends Application {
final ServletContextHandler cxfContext = new ServletContextHandler();
cxfContext.setSessionHandler(new SessionHandler());
cxfContext.setContextPath(conf.getContextPath() + "/api");
cxfContext.setContextPath(conf.getServerContextPath() + "/api");
cxfContext.addServlet(cxfServletHolder, "/*");
cxfContext.addFilter(new FilterHolder(CorsFilter.class), "/*",
@ -235,7 +235,7 @@ public class ZeppelinServer extends Application {
// Development mode, read from FS
// webApp.setDescriptor(warPath+"/WEB-INF/web.xml");
webApp.setResourceBase(warPath.getPath());
webApp.setContextPath(conf.getContextPath());
webApp.setContextPath(conf.getServerContextPath());
webApp.setParentLoaderPriority(true);
} else {
// use packaged WAR

6
zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
View file

@ -268,8 +268,8 @@ public class ZeppelinConfiguration extends XMLConfiguration {
return getInt(ConfVars.ZEPPELIN_PORT);
}
public String getContextPath() {
return getString(ConfVars.ZEPPELIN_CONTEXT_PATH);
public String getServerContextPath() {
return getString(ConfVars.ZEPPELIN_SERVER_CONTEXT_PATH);
}
public String getKeyStorePath() {
@ -387,7 +387,7 @@ public class ZeppelinConfiguration extends XMLConfiguration {
ZEPPELIN_HOME("zeppelin.home", "../"),
ZEPPELIN_ADDR("zeppelin.server.addr", "0.0.0.0"),
ZEPPELIN_PORT("zeppelin.server.port", 8080),
ZEPPELIN_CONTEXT_PATH("zeppelin.server.context.path", "/"),
ZEPPELIN_SERVER_CONTEXT_PATH("zeppelin.server.context.path", "/"),
ZEPPELIN_SSL("zeppelin.ssl", false),
ZEPPELIN_SSL_CLIENT_AUTH("zeppelin.ssl.client.auth", false),
ZEPPELIN_SSL_KEYSTORE_PATH("zeppelin.ssl.keystore.path", "keystore"),