From 5002a1583681cff847c08977e614963a854d8f1b Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 24 Aug 2016 18:05:52 +0200 Subject: [PATCH 01/18] add guice dependencies --- pom.xml | 30 ++++++++++++++----- zeppelin-server/pom.xml | 11 +++++++ .../zeppelin/server/ZeppelinServer.java | 6 ++++ .../zeppelin/conf/ZeppelinConfiguration.java | 15 +++++++++- 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d971d9ac983..16ea80d306a 100755 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,9 @@ 1.7.10 1.2.17 0.9.2 + 1.14.2 2.2 + 4.1.0 15.0 9.2.15.v20160210 @@ -193,14 +195,6 @@ ${guava.version} - - - junit - junit - 4.11 - test - - org.apache.shiro @@ -212,6 +206,26 @@ shiro-web 1.2.3 + + + com.google.inject + guice + ${guice.version} + + + + com.netflix.governator + governator + ${governator.version} + + + + junit + junit + 4.11 + test + + diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 675a2ce0148..4364b4d327a 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -286,6 +286,17 @@ org.apache.shiro shiro-web + + + com.google.inject + guice + + + + com.netflix.governator + governator + + 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 7412611532b..d29081afed2 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 @@ -17,10 +17,13 @@ package org.apache.zeppelin.server; +import com.google.inject.Guice; +import com.google.inject.Injector; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; import org.apache.zeppelin.dep.DependencyResolver; +import org.apache.zeppelin.inject.ZeppelinModule; import org.apache.zeppelin.interpreter.InterpreterFactory; import org.apache.zeppelin.notebook.Notebook; import org.apache.zeppelin.notebook.NotebookAuthorization; @@ -62,6 +65,7 @@ public class ZeppelinServer extends Application { public static Notebook notebook; public static Server jettyWebServer; public static NotebookServer notebookWsServer; + public static Injector injector; private SchedulerFactory schedulerFactory; private InterpreterFactory replFactory; @@ -93,6 +97,8 @@ public static void main(String[] args) throws InterruptedException { ZeppelinConfiguration conf = ZeppelinConfiguration.create(); conf.setProperty("args", args); + injector = Guice.createInjector(new ZeppelinModule(conf)); + jettyWebServer = setupJettyServer(conf); ContextHandlerCollection contexts = new ContextHandlerCollection(); 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 7572ade9f9f..77326d76d7d 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 @@ -251,6 +251,14 @@ public boolean getBoolean(String envName, String propertyName, boolean defaultVa return getBooleanValue(propertyName, defaultValue); } + public Class getClass(ConfVars c) { + try { + return Class.forName(c.getStringValue()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + public boolean useSsl() { return getBoolean(ConfVars.ZEPPELIN_SSL); } @@ -322,6 +330,10 @@ public String getTrustStorePassword() { } } + public Class getZeppelingApiWebFilterClassname() { + return getClass(ConfVars.ZEPPELIN_API_WEB_FILTER_CLASSNAME); + } + public String getNotebookDir() { return getString(ConfVars.ZEPPELIN_NOTEBOOK_DIR); } @@ -536,7 +548,8 @@ public static enum ConfVars { ZEPPELIN_ALLOWED_ORIGINS("zeppelin.server.allowed.origins", "*"), ZEPPELIN_ANONYMOUS_ALLOWED("zeppelin.anonymous.allowed", true), ZEPPELIN_CREDENTIALS_PERSIST("zeppelin.credentials.persist", true), - ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size", "1024000"); + ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size", "1024000"), + ZEPPELIN_API_WEB_FILTER_CLASSNAME("zeppelin.aoi.web.filter", "local-repo"); private String varName; From 1d2b80a9be1054312ccba3b5d4b4f3086ecd3f33 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Thu, 25 Aug 2016 10:17:58 +0200 Subject: [PATCH 02/18] Initial working implemenation of service injection for WebSecurity and SearchService --- pom.xml | 2 +- zeppelin-interpreter/pom.xml | 13 ++++++- zeppelin-server/pom.xml | 5 --- .../zeppelin/server/ZeppelinServer.java | 37 ++++++++----------- zeppelin-web/pom.xml | 4 +- zeppelin-zengine/pom.xml | 16 ++++++++ .../zeppelin/conf/ZeppelinConfiguration.java | 12 ++++-- .../apache/zeppelin/search/LuceneSearch.java | 1 - .../notebook/repo/VFSNotebookRepoTest.java | 2 - 9 files changed, 55 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index c1f482d16da..088efd7253a 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 2.10.5 - 2.11 + 2.10 2.2.4 1.12.5 diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index 3309746b527..4bf414ffb04 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -179,9 +179,19 @@ org.apache.maven.wagon wagon-provider-api + + org.sonatype.sisu + sisu-guice + + + com.google.inject + guice + ${guice.version} + + org.apache.maven.wagon wagon-provider-api @@ -234,7 +244,7 @@ - + diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 63cd80bc0fb..c162e8a47ca 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -298,11 +298,6 @@ shiro-web - - com.google.inject - guice - - com.netflix.governator governator 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 a7ad4d79c58..5a0d05b1a6f 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 @@ -22,19 +22,17 @@ import java.io.File; import java.io.IOException; -import java.util.EnumSet; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.ExecutorService; -import javax.net.ssl.SSLContext; -import javax.servlet.DispatcherType; +import javax.inject.Inject; import javax.ws.rs.core.Application; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; import org.apache.zeppelin.dep.DependencyResolver; +import org.apache.zeppelin.web.WebSecurity; import org.apache.zeppelin.inject.ZeppelinModule; import org.apache.zeppelin.helium.Helium; import org.apache.zeppelin.helium.HeliumApplicationFactory; @@ -45,17 +43,14 @@ import org.apache.zeppelin.notebook.repo.NotebookRepoSync; import org.apache.zeppelin.rest.*; import org.apache.zeppelin.scheduler.SchedulerFactory; -import org.apache.zeppelin.search.LuceneSearch; import org.apache.zeppelin.search.SearchService; import org.apache.zeppelin.socket.NotebookServer; import org.apache.zeppelin.user.Credentials; -import org.apache.zeppelin.utils.SecurityUtils; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.*; import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -75,17 +70,24 @@ public class ZeppelinServer extends Application { public static Helium helium; public static HeliumApplicationFactory heliumApplicationFactory; public static Injector injector; + @Inject + private static WebSecurity webSecurity; private SchedulerFactory schedulerFactory; private InterpreterFactory replFactory; private NotebookRepo notebookRepo; - private SearchService notebookIndex; + + @Inject + private SearchService searchService; + @Inject + private ZeppelinConfiguration conf; private NotebookAuthorization notebookAuthorization; private Credentials credentials; private DependencyResolver depResolver; public ZeppelinServer() throws Exception { - ZeppelinConfiguration conf = ZeppelinConfiguration.create(); + + injector.injectMembers(this); this.depResolver = new DependencyResolver( conf.getString(ConfVars.ZEPPELIN_INTERPRETER_LOCALREPO)); @@ -96,12 +98,11 @@ public ZeppelinServer() throws Exception { this.replFactory = new InterpreterFactory(conf, notebookWsServer, notebookWsServer, heliumApplicationFactory, depResolver); this.notebookRepo = new NotebookRepoSync(conf); - this.notebookIndex = new LuceneSearch(); this.notebookAuthorization = new NotebookAuthorization(conf); this.credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath()); notebook = new Notebook(conf, notebookRepo, schedulerFactory, replFactory, notebookWsServer, - notebookIndex, notebookAuthorization, credentials); + searchService, notebookAuthorization, credentials); // to update notebook from application event from remote process. heliumApplicationFactory.setNotebook(notebook); @@ -260,14 +261,7 @@ private static void setupRestApiContextHandler(WebAppContext webapp, webapp.setSessionHandler(new SessionHandler()); webapp.addServlet(cxfServletHolder, "/api/*"); - webapp.setInitParameter("shiroConfigLocations", - new File(conf.getShiroPath()).toURI().toString()); - - SecurityUtils.initSecurityManager(conf.getShiroPath()); - webapp.addFilter(org.apache.shiro.web.servlet.ShiroFilter.class, "/api/*", - EnumSet.allOf(DispatcherType.class)); - - webapp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); + webSecurity.addSecurityFilter(webapp); } @@ -294,8 +288,7 @@ private static WebAppContext setupWebAppContext(ContextHandlerCollection context webApp.addServlet(new ServletHolder(new DefaultServlet()), "/*"); contexts.addHandler(webApp); - webApp.addFilter(new FilterHolder(CorsFilter.class), "/*", - EnumSet.allOf(DispatcherType.class)); + webSecurity.addCorFilter(webApp); return webApp; @@ -315,7 +308,7 @@ public Set getSingletons() { ZeppelinRestApi root = new ZeppelinRestApi(); singletons.add(root); - NotebookRestApi notebookApi = new NotebookRestApi(notebook, notebookWsServer, notebookIndex); + NotebookRestApi notebookApi = new NotebookRestApi(notebook, notebookWsServer, searchService); singletons.add(notebookApi); HeliumRestApi heliumApi = new HeliumRestApi(helium, heliumApplicationFactory, notebook); diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index 8e7f7cda829..34ef2d4cfc2 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -127,7 +127,7 @@ grunt - build + build --force @@ -138,7 +138,7 @@ test - test + test --force diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml index b7e1938ff60..4e0171c3dd6 100644 --- a/zeppelin-zengine/pom.xml +++ b/zeppelin-zengine/pom.xml @@ -96,6 +96,12 @@ org.apache.commons commons-vfs2 2.0 + + + org.codehaus.plexus + plexus-utils + + @@ -107,6 +113,10 @@ org.apache.httpcomponents httpclient + + commons-httpclient + commons-httpclient + @@ -150,6 +160,12 @@ guava + + org.codehaus.plexus + plexus-utils + 2.0.7 + + org.apache.lucene lucene-core 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 9b512579d85..93b40463303 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 @@ -330,8 +330,12 @@ public String getTrustStorePassword() { } } - public Class getZeppelingApiWebFilterClassname() { - return getClass(ConfVars.ZEPPELIN_API_WEB_FILTER_CLASSNAME); + public Class getZeppelinWebSecurityClassname() { + return getClass(ConfVars.ZEPPELIN_WEB_SECURITY_CLASSNAME); + } + + public Class getZeppelinSearchServiceClassname() { + return getClass(ConfVars.ZEPPELIN_SEARCH_SERVICE_CLASSNAME); } public String getNotebookDir() { @@ -571,7 +575,9 @@ public static enum ConfVars { ZEPPELIN_CREDENTIALS_PERSIST("zeppelin.credentials.persist", true), ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size", "1024000"), ZEPPELIN_USE_JDBC_ALIAS("zeppelin.use.jdbc.alias", true), - ZEPPELIN_API_WEB_FILTER_CLASSNAME("zeppelin.api.web.filter", "local-repo"); + ZEPPELIN_WEB_SECURITY_CLASSNAME("zeppelin.web.security.classname", "org.apache.zeppelin.web.DefaultWebSecurity"), + ZEPPELIN_SEARCH_SERVICE_CLASSNAME("zeppelin.search.service.classname", "org.apache.zeppelin.search.LuceneSearch") + ; private String varName; diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java index b43c45365d1..5cf8902ea3a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/search/LuceneSearch.java @@ -39,7 +39,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.MultiFieldQueryParser; import org.apache.lucene.queryparser.classic.ParseException; -import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java index 7eaca8c74eb..f6053dc3963 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java @@ -32,10 +32,8 @@ import org.apache.zeppelin.interpreter.InterpreterOption; import org.apache.zeppelin.interpreter.mock.MockInterpreter1; import org.apache.zeppelin.notebook.*; -import org.apache.zeppelin.scheduler.JobListener; import org.apache.zeppelin.scheduler.SchedulerFactory; import org.apache.zeppelin.search.SearchService; -import org.apache.zeppelin.search.LuceneSearch; import org.junit.After; import org.junit.Before; import org.junit.Test; From 3641e5bd823b3122ad63e4044d800664fe461d7e Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Thu, 25 Aug 2016 15:03:52 +0200 Subject: [PATCH 03/18] temporary comment governator - seems to give issues when zeppelin run in the shell --- pom.xml | 4 ++-- zeppelin-server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 088efd7253a..9afd7a0a89b 100644 --- a/pom.xml +++ b/pom.xml @@ -214,13 +214,13 @@ guice ${guice.version} - + junit junit diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index c162e8a47ca..435340b47ee 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -297,12 +297,12 @@ org.apache.shiro shiro-web - + From da097a7dbfa67f308612f616e170a84ef7f0d534 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 31 Aug 2016 10:42:15 +0200 Subject: [PATCH 04/18] Revert change made to zeppelin-web/pom.xml --- zeppelin-web/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index 34ef2d4cfc2..8e7f7cda829 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -127,7 +127,7 @@ grunt - build --force + build @@ -138,7 +138,7 @@ test - test --force + test From 74adbd4250727aab3b15c2261c7d58fec5a75bd2 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Fri, 2 Sep 2016 15:31:22 +0200 Subject: [PATCH 05/18] Fix format --- .../java/org/apache/zeppelin/inject/ZeppelinModule.java | 9 +++++++-- .../java/org/apache/zeppelin/web/DefaultWebSecurity.java | 4 ++++ .../main/java/org/apache/zeppelin/web/WebSecurity.java | 4 ++++ .../org/apache/zeppelin/conf/ZeppelinConfiguration.java | 6 ++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/inject/ZeppelinModule.java b/zeppelin-server/src/main/java/org/apache/zeppelin/inject/ZeppelinModule.java index a1a837bee29..c997d141a79 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/inject/ZeppelinModule.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/inject/ZeppelinModule.java @@ -25,6 +25,9 @@ import org.apache.zeppelin.server.ZeppelinServer; import org.apache.zeppelin.web.WebSecurity; +/** + * Guice injection module. + */ public class ZeppelinModule implements Module { private ZeppelinConfiguration conf; @@ -35,9 +38,11 @@ public ZeppelinModule(ZeppelinConfiguration conf) { @Override public void configure(Binder binder) { - binder.bind(WebSecurity.class).to((Class) conf.getZeppelinWebSecurityClassname()); + binder.bind(WebSecurity.class) + .to((Class) conf.getZeppelinWebSecurityClassname()); - binder.bind(SearchService.class).to((Class) conf.getZeppelinSearchServiceClassname()); + binder.bind(SearchService.class) + .to((Class) conf.getZeppelinSearchServiceClassname()); binder.requestStaticInjection(ZeppelinServer.class); diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index 65787a91b10..6bba0a74032 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -28,6 +28,10 @@ import java.io.File; import java.util.EnumSet; +/** + * Default implementation of the actions to be taken + * by Zeppelin to secure the Web channel. + */ public class DefaultWebSecurity implements WebSecurity { @Inject diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/WebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/WebSecurity.java index 237e865ba9a..29a9b4e1a65 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/WebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/WebSecurity.java @@ -19,6 +19,10 @@ import org.eclipse.jetty.webapp.WebAppContext; +/** + * Definition of the actions to be taken + * by Zeppelin to secure the Web channel. + */ public interface WebSecurity { void addCorFilter(WebAppContext webApp); 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 93b40463303..f952451bacd 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 @@ -575,8 +575,10 @@ public static enum ConfVars { ZEPPELIN_CREDENTIALS_PERSIST("zeppelin.credentials.persist", true), ZEPPELIN_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE("zeppelin.websocket.max.text.message.size", "1024000"), ZEPPELIN_USE_JDBC_ALIAS("zeppelin.use.jdbc.alias", true), - ZEPPELIN_WEB_SECURITY_CLASSNAME("zeppelin.web.security.classname", "org.apache.zeppelin.web.DefaultWebSecurity"), - ZEPPELIN_SEARCH_SERVICE_CLASSNAME("zeppelin.search.service.classname", "org.apache.zeppelin.search.LuceneSearch") + ZEPPELIN_WEB_SECURITY_CLASSNAME("zeppelin.web.security.classname", + "org.apache.zeppelin.web.DefaultWebSecurity"), + ZEPPELIN_SEARCH_SERVICE_CLASSNAME("zeppelin.search.service.classname", + "org.apache.zeppelin.search.LuceneSearch") ; From ebe7ebb336f182581df5e2c5d7df01308f88b367 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Sat, 18 Mar 2017 12:23:13 +0100 Subject: [PATCH 06/18] Automatic message for commit of samedi 18 mars 2017, 11:23:13 (UTC+0000) --- beam/pom.xml | 10 +++++----- cassandra/pom.xml | 2 +- flink/pom.xml | 2 +- ignite/pom.xml | 2 +- pom.xml | 4 ++-- r/pom.xml | 2 +- scalding/pom.xml | 2 +- scio/pom.xml | 2 +- spark-dependencies/pom.xml | 2 +- spark/pom.xml | 2 +- zeppelin-display/pom.xml | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/beam/pom.xml b/beam/pom.xml index c02695c460d..4823089c5c6 100644 --- a/beam/pom.xml +++ b/beam/pom.xml @@ -52,7 +52,7 @@ org.apache.spark - spark-core_2.10 + spark-core_2.11 ${beam.spark.version} @@ -64,15 +64,15 @@ io.netty - akka-actor_2.10 + akka-actor_2.11 org.spark-project.akka - akka-remote_2.10 + akka-remote_2.11 org.spark-project.akka - akka-slf4j_2.10 + akka-slf4j_2.11 org.spark-project.akka @@ -80,7 +80,7 @@ org.apache.spark - spark-streaming_2.10 + spark-streaming_2.11 ${beam.spark.version} diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 05108e9fd48..e9d4cffe5bb 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-cassandra_2.10 + zeppelin-cassandra_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Apache Cassandra interpreter diff --git a/flink/pom.xml b/flink/pom.xml index 19e7c5e48b1..d7d12f293a7 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-flink_2.10 + zeppelin-flink_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Flink diff --git a/ignite/pom.xml b/ignite/pom.xml index aadb9dd329c..8b983070023 100644 --- a/ignite/pom.xml +++ b/ignite/pom.xml @@ -26,7 +26,7 @@ .. - zeppelin-ignite_2.10 + zeppelin-ignite_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Apache Ignite interpreter diff --git a/pom.xml b/pom.xml index af2bdf78803..b94d7a2a4ea 100644 --- a/pom.xml +++ b/pom.xml @@ -82,8 +82,8 @@ - 2.10.5 - 2.10 + 2.11.7 + 2.11 2.2.4 1.12.5 diff --git a/r/pom.xml b/r/pom.xml index 4c1b218335d..97537b12cc8 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -27,7 +27,7 @@ .. - zeppelin-zrinterpreter_2.10 + zeppelin-zrinterpreter_2.11 jar Zeppelin: R Interpreter R Interpreter for Zeppelin diff --git a/scalding/pom.xml b/scalding/pom.xml index cc1015f21b1..20d7dc6522f 100644 --- a/scalding/pom.xml +++ b/scalding/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-scalding_2.10 + zeppelin-scalding_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Scalding interpreter diff --git a/scio/pom.xml b/scio/pom.xml index 3d17dc88efc..9c1a743d380 100644 --- a/scio/pom.xml +++ b/scio/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-scio_2.10 + zeppelin-scio_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Scio diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index 2ce787c347c..c866736c9f6 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -28,7 +28,7 @@ org.apache.zeppelin - zeppelin-spark-dependencies_2.10 + zeppelin-spark-dependencies_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Spark dependencies diff --git a/spark/pom.xml b/spark/pom.xml index 046b4d5d534..09e1cfe2dad 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-spark_2.10 + zeppelin-spark_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Spark diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index 4058aefbf11..9c6af6434b8 100644 --- a/zeppelin-display/pom.xml +++ b/zeppelin-display/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-display_2.10 + zeppelin-display_2.11 jar 0.8.0-SNAPSHOT Zeppelin: Display system apis From 1fd04575a279ae6ad037081327804c7e8208a6a3 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Thu, 6 Apr 2017 14:57:16 +0200 Subject: [PATCH 07/18] revert back to scala 2.10 --- beam/pom.xml | 10 +++++----- cassandra/pom.xml | 2 +- flink/pom.xml | 2 +- ignite/pom.xml | 2 +- pom.xml | 4 ++-- r/pom.xml | 2 +- scalding/pom.xml | 2 +- scio/pom.xml | 2 +- spark-dependencies/pom.xml | 2 +- spark/pom.xml | 2 +- zeppelin-display/pom.xml | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/beam/pom.xml b/beam/pom.xml index 4823089c5c6..c02695c460d 100644 --- a/beam/pom.xml +++ b/beam/pom.xml @@ -52,7 +52,7 @@ org.apache.spark - spark-core_2.11 + spark-core_2.10 ${beam.spark.version} @@ -64,15 +64,15 @@ io.netty - akka-actor_2.11 + akka-actor_2.10 org.spark-project.akka - akka-remote_2.11 + akka-remote_2.10 org.spark-project.akka - akka-slf4j_2.11 + akka-slf4j_2.10 org.spark-project.akka @@ -80,7 +80,7 @@ org.apache.spark - spark-streaming_2.11 + spark-streaming_2.10 ${beam.spark.version} diff --git a/cassandra/pom.xml b/cassandra/pom.xml index e9d4cffe5bb..05108e9fd48 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-cassandra_2.11 + zeppelin-cassandra_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Apache Cassandra interpreter diff --git a/flink/pom.xml b/flink/pom.xml index d7d12f293a7..19e7c5e48b1 100644 --- a/flink/pom.xml +++ b/flink/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-flink_2.11 + zeppelin-flink_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Flink diff --git a/ignite/pom.xml b/ignite/pom.xml index 8b983070023..aadb9dd329c 100644 --- a/ignite/pom.xml +++ b/ignite/pom.xml @@ -26,7 +26,7 @@ .. - zeppelin-ignite_2.11 + zeppelin-ignite_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Apache Ignite interpreter diff --git a/pom.xml b/pom.xml index 99c635f485c..96ebc2ac9c1 100644 --- a/pom.xml +++ b/pom.xml @@ -82,8 +82,8 @@ - 2.11.7 - 2.11 + 2.10.5 + 2.10 2.2.4 1.12.5 diff --git a/r/pom.xml b/r/pom.xml index 97537b12cc8..4c1b218335d 100644 --- a/r/pom.xml +++ b/r/pom.xml @@ -27,7 +27,7 @@ .. - zeppelin-zrinterpreter_2.11 + zeppelin-zrinterpreter_2.10 jar Zeppelin: R Interpreter R Interpreter for Zeppelin diff --git a/scalding/pom.xml b/scalding/pom.xml index 20d7dc6522f..cc1015f21b1 100644 --- a/scalding/pom.xml +++ b/scalding/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-scalding_2.11 + zeppelin-scalding_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Scalding interpreter diff --git a/scio/pom.xml b/scio/pom.xml index 9c1a743d380..3d17dc88efc 100644 --- a/scio/pom.xml +++ b/scio/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-scio_2.11 + zeppelin-scio_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Scio diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml index c866736c9f6..2ce787c347c 100644 --- a/spark-dependencies/pom.xml +++ b/spark-dependencies/pom.xml @@ -28,7 +28,7 @@ org.apache.zeppelin - zeppelin-spark-dependencies_2.11 + zeppelin-spark-dependencies_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Spark dependencies diff --git a/spark/pom.xml b/spark/pom.xml index 09e1cfe2dad..046b4d5d534 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-spark_2.11 + zeppelin-spark_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Spark diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index 9c6af6434b8..4058aefbf11 100644 --- a/zeppelin-display/pom.xml +++ b/zeppelin-display/pom.xml @@ -27,7 +27,7 @@ org.apache.zeppelin - zeppelin-display_2.11 + zeppelin-display_2.10 jar 0.8.0-SNAPSHOT Zeppelin: Display system apis From 85e6572aef227f78a2ee7b81cda3508cef7c8058 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Tue, 18 Apr 2017 17:49:50 +0200 Subject: [PATCH 08/18] Use com.google.inject.Inject instead of javax.inject.Inject to avoid issues with upcoming jersey2 --- .../main/java/org/apache/zeppelin/server/ZeppelinServer.java | 2 +- 1 file changed, 1 insertion(+), 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 9e1e738effc..8b2e1384260 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 @@ -25,7 +25,7 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; +import com.google.inject.Inject; import javax.ws.rs.core.Application; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; From 7836b894ec1678c87d9ee0f4572b6479bd7ecc7d Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Wed, 19 Apr 2017 09:27:03 +0200 Subject: [PATCH 09/18] Remove duplicate searchService field --- .../main/java/org/apache/zeppelin/server/ZeppelinServer.java | 3 +-- 1 file changed, 1 insertion(+), 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 8b2e1384260..3a2fe90abd8 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 @@ -94,10 +94,9 @@ public class ZeppelinServer extends Application { private SchedulerFactory schedulerFactory; private InterpreterFactory replFactory; - @Inject - private SearchService searchService; @Inject private ZeppelinConfiguration conf; + @Inject private SearchService noteSearchService; private NotebookRepoSync notebookRepo; private NotebookAuthorization notebookAuthorization; From 146bf62da607eb53c345d8c8e1a30b1b63bd7fb2 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Sun, 23 Apr 2017 19:13:08 +0200 Subject: [PATCH 10/18] merge master --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1ff72064280..a687cd9a6bc 100644 --- a/pom.xml +++ b/pom.xml @@ -196,15 +196,15 @@ -<<<<<<< HEAD com.google.inject guice ${guice.version} -======= + + + org.danilopianini gson-extras ${gson-extras.version} ->>>>>>> master From 7065f501f1da19b16541a411521ff1329156251b Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Thu, 4 May 2017 09:40:58 +0200 Subject: [PATCH 11/18] fix typo when merging --- .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 1 - 1 file changed, 1 deletion(-) 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 63186575842..5c8370717c9 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 @@ -671,7 +671,6 @@ public static enum ConfVars { "org.apache.zeppelin.web.DefaultWebSecurity"), ZEPPELIN_SEARCH_SERVICE_CLASSNAME("zeppelin.search.service.classname", "org.apache.zeppelin.search.LuceneSearch"), - ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED("zeppelin.server.default.dir.allowed", false); ZEPPELIN_SERVER_DEFAULT_DIR_ALLOWED("zeppelin.server.default.dir.allowed", false), ZEPPELIN_SERVER_JETTY_NAME("zeppelin.server.jetty.name", null); From 25d744e5f4bb6f0987ebef5f20d8155cbb61389a Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 5 Jun 2017 20:56:42 +0200 Subject: [PATCH 12/18] Align to master change --- .../apache/zeppelin/web/DefaultWebSecurity.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index 6bba0a74032..3a6a1aeb922 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -48,14 +48,14 @@ public void addCorFilter(WebAppContext webApp) { @Override public void addSecurityFilter(WebAppContext webApp) { - webApp.setInitParameter("shiroConfigLocations", - new File(conf.getShiroPath()).toURI().toString()); - - SecurityUtils.initSecurityManager(conf.getShiroPath()); - webApp.addFilter(org.apache.shiro.web.servlet.ShiroFilter.class, "/api/*", - EnumSet.allOf(DispatcherType.class)); - - webApp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); + String shiroIniPath = conf.getShiroPath(); + + if (!StringUtils.isBlank(shiroIniPath)) { + webapp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); + SecurityUtils.initSecurityManager(shiroIniPath); + webapp.addFilter(org.apache.shiro.web.servlet.ShiroFilte.class, "/api/*", EnumSet.allOf(DispatcherType.class)); + webapp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); + } } From dff202a411873d24305a9db1cb5a1e1b0d412b15 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 5 Jun 2017 20:58:26 +0200 Subject: [PATCH 13/18] fix compilation issue --- .../java/org/apache/zeppelin/web/DefaultWebSecurity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index 3a6a1aeb922..cb3f4a82f2f 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -17,6 +17,7 @@ package org.apache.zeppelin.web; +import org.apache.commons.lang3.StringUtils; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.server.CorsFilter; import org.apache.zeppelin.utils.SecurityUtils; @@ -51,10 +52,10 @@ public void addSecurityFilter(WebAppContext webApp) { String shiroIniPath = conf.getShiroPath(); if (!StringUtils.isBlank(shiroIniPath)) { - webapp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); + webApp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); SecurityUtils.initSecurityManager(shiroIniPath); - webapp.addFilter(org.apache.shiro.web.servlet.ShiroFilte.class, "/api/*", EnumSet.allOf(DispatcherType.class)); - webapp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); + webApp.addFilter(org.apache.shiro.web.servlet.ShiroFilte.class, "/api/*", EnumSet.allOf(DispatcherType.class)); + webApp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); } } From b57ca32c456d1a4ea48f289aff17157de0065964 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Mon, 5 Jun 2017 20:58:44 +0200 Subject: [PATCH 14/18] fix compilation issue --- .../main/java/org/apache/zeppelin/web/DefaultWebSecurity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index cb3f4a82f2f..8bb9e280f83 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -54,7 +54,7 @@ public void addSecurityFilter(WebAppContext webApp) { if (!StringUtils.isBlank(shiroIniPath)) { webApp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); SecurityUtils.initSecurityManager(shiroIniPath); - webApp.addFilter(org.apache.shiro.web.servlet.ShiroFilte.class, "/api/*", EnumSet.allOf(DispatcherType.class)); + webApp.addFilter(org.apache.shiro.web.servlet.ShiroFilter.class, "/api/*", EnumSet.allOf(DispatcherType.class)); webApp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); } From 32544903ff7b25f42d27b409d4a480886c396e8a Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Fri, 21 Jul 2017 12:03:32 +0200 Subject: [PATCH 15/18] update to master --- .../apache/zeppelin/web/DefaultWebSecurity.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index 8bb9e280f83..ff893cdfaa2 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -50,14 +50,16 @@ public void addCorFilter(WebAppContext webApp) { public void addSecurityFilter(WebAppContext webApp) { String shiroIniPath = conf.getShiroPath(); - - if (!StringUtils.isBlank(shiroIniPath)) { - webApp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); - SecurityUtils.initSecurityManager(shiroIniPath); - webApp.addFilter(org.apache.shiro.web.servlet.ShiroFilter.class, "/api/*", EnumSet.allOf(DispatcherType.class)); - webApp.addEventListener(new org.apache.shiro.web.env.EnvironmentLoaderListener()); + + if (!StringUtils.isBlank(shiroIniPath)) { + webapp.setInitParameter("shiroConfigLocations", new File(shiroIniPath).toURI().toString()); + SecurityUtils.setIsEnabled(true); + webapp.addFilter(ShiroFilter.class, "/api/*", EnumSet.allOf(DispatcherType.class)) + .setInitParameter("staticSecurityManagerEnabled", "true"); + webapp.addEventListener(new EnvironmentLoaderListener()); } + } } From 6139e99d18d704559e1c8eea95b6c1d882186d9b Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Fri, 21 Jul 2017 13:17:08 +0200 Subject: [PATCH 16/18] Fix compilation issue: --- .../java/org/apache/zeppelin/web/DefaultWebSecurity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java index ff893cdfaa2..82040587ff9 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/web/DefaultWebSecurity.java @@ -18,6 +18,8 @@ package org.apache.zeppelin.web; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.web.env.EnvironmentLoaderListener; +import org.apache.shiro.web.servlet.ShiroFilter; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.server.CorsFilter; import org.apache.zeppelin.utils.SecurityUtils; @@ -47,7 +49,7 @@ public void addCorFilter(WebAppContext webApp) { } @Override - public void addSecurityFilter(WebAppContext webApp) { + public void addSecurityFilter(WebAppContext webapp) { String shiroIniPath = conf.getShiroPath(); @@ -59,7 +61,6 @@ public void addSecurityFilter(WebAppContext webApp) { webapp.addEventListener(new EnvironmentLoaderListener()); } - } } From da0ede7f458cbf7f2a5a65dc1ac0dcb8fa699b06 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Sun, 3 Sep 2017 08:47:48 +0200 Subject: [PATCH 17/18] fix --- .../zeppelin/server/ZeppelinServer.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 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 4b9875cebe5..91107ed2f58 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 @@ -9,7 +9,7 @@ * 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, + * 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. @@ -19,13 +19,16 @@ import com.google.inject.Guice; import com.google.inject.Injector; +import com.google.inject.Inject; + +import org.apache.zeppelin.web.WebSecurity; +import org.apache.zeppelin.inject.ZeppelinModule; import java.io.File; import java.io.IOException; import java.util.HashSet; import java.util.Set; -import com.google.inject.Inject; import javax.ws.rs.core.Application; import org.apache.commons.lang.StringUtils; @@ -35,8 +38,6 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; import org.apache.zeppelin.dep.DependencyResolver; import org.apache.zeppelin.utils.SecurityUtils; -import org.apache.zeppelin.web.WebSecurity; -import org.apache.zeppelin.inject.ZeppelinModule; import org.apache.zeppelin.helium.Helium; import org.apache.zeppelin.helium.HeliumApplicationFactory; import org.apache.zeppelin.helium.HeliumBundleFactory; @@ -155,19 +156,6 @@ public ZeppelinServer() throws Exception { LOG.error(e.getMessage(), e); } - this.schedulerFactory = new SchedulerFactory(); - this.interpreterSettingManager = new InterpreterSettingManager(conf, depResolver, - new InterpreterOption(true)); - this.replFactory = new InterpreterFactory(conf, notebookWsServer, - notebookWsServer, heliumApplicationFactory, depResolver, SecurityUtils.isAuthenticated(), - interpreterSettingManager); - this.notebookRepo = new NotebookRepoSync(conf); - this.notebookAuthorization = NotebookAuthorization.init(conf); - this.credentials = new Credentials(conf.credentialsPersist(), conf.getCredentialsPath()); - notebook = new Notebook(conf, - notebookRepo, schedulerFactory, replFactory, interpreterSettingManager, notebookWsServer, - noteSearchService, notebookAuthorization, credentials); - // to update notebook from application event from remote process. heliumApplicationFactory.setNotebook(notebook); // to update fire websocket event on application event. @@ -175,6 +163,7 @@ public ZeppelinServer() throws Exception { notebook.addNotebookEventListener(heliumApplicationFactory); notebook.addNotebookEventListener(notebookWsServer.getNotebookInformationListener()); + } public static void main(String[] args) throws InterruptedException { From 2e6d28fa789e9862f9b87d7e065e24446027ad60 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Sun, 3 Sep 2017 08:49:46 +0200 Subject: [PATCH 18/18] fix --- .../java/org/apache/zeppelin/server/ZeppelinServer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 91107ed2f58..7c72b9c6f4b 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 @@ -26,9 +26,11 @@ import java.io.File; import java.io.IOException; +import java.util.EnumSet; import java.util.HashSet; import java.util.Set; +import javax.servlet.DispatcherType; import javax.ws.rs.core.Application; import org.apache.commons.lang.StringUtils; @@ -36,13 +38,10 @@ import org.apache.shiro.web.servlet.ShiroFilter; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars; -import org.apache.zeppelin.dep.DependencyResolver; -import org.apache.zeppelin.utils.SecurityUtils; import org.apache.zeppelin.helium.Helium; import org.apache.zeppelin.helium.HeliumApplicationFactory; import org.apache.zeppelin.helium.HeliumBundleFactory; import org.apache.zeppelin.interpreter.InterpreterFactory; -import org.apache.zeppelin.interpreter.InterpreterOption; import org.apache.zeppelin.interpreter.InterpreterOutput; import org.apache.zeppelin.interpreter.InterpreterSettingManager; import org.apache.zeppelin.notebook.Notebook; @@ -58,9 +57,11 @@ import org.apache.zeppelin.rest.SecurityRestApi; import org.apache.zeppelin.rest.ZeppelinRestApi; import org.apache.zeppelin.scheduler.SchedulerFactory; +import org.apache.zeppelin.search.LuceneSearch; import org.apache.zeppelin.search.SearchService; import org.apache.zeppelin.socket.NotebookServer; import org.apache.zeppelin.user.Credentials; +import org.apache.zeppelin.utils.SecurityUtils; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -71,6 +72,7 @@ import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.servlet.DefaultServlet; +import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory;