Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Solve #1657, Remove regexp package dependency #1658

Merged
merged 2 commits into from
Mar 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions conf/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
8 changes: 0 additions & 8 deletions smart-integration/conf/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
8 changes: 0 additions & 8 deletions smart-integration/src/test/resources/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
8 changes: 0 additions & 8 deletions smart-server/conf/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
8 changes: 0 additions & 8 deletions smart-server/src/test/resources/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
8 changes: 0 additions & 8 deletions smart-zeppelin/conf/zeppelin-site.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,6 @@
</property>
-->

<!-- Notebook storage layer using local file system
<property>
<name>zeppelin.notebook.storage</name>
<value>org.apache.zeppelin.notebook.repo.VFSNotebookRepo</value>
<description>local notebook persistence layer implementation</description>
</property>
-->

<!-- For connecting your Zeppelin with ZeppelinHub -->
<!--
<property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@
import org.apache.zeppelin.interpreter.InterpreterSettingManager;
import org.apache.zeppelin.notebook.Notebook;
import org.apache.zeppelin.notebook.NotebookAuthorization;
import org.apache.zeppelin.notebook.repo.NotebookRepoSync;
import org.apache.zeppelin.rest.CredentialRestApi;
import org.apache.zeppelin.rest.HeliumRestApi;
import org.apache.zeppelin.rest.LoginRestApi;
import org.apache.zeppelin.rest.NotebookRepoRestApi;
import org.apache.zeppelin.rest.SecurityRestApi;
import org.apache.zeppelin.rest.ZeppelinRestApi;
import org.apache.zeppelin.scheduler.SchedulerFactory;
Expand Down Expand Up @@ -95,7 +93,6 @@ public class SmartZeppelinServer {
private SchedulerFactory schedulerFactory;
private InterpreterFactory replFactory;
private SearchService noteSearchService;
private NotebookRepoSync notebookRepo;
private NotebookAuthorization notebookAuthorization;
private Credentials credentials;
private DependencyResolver depResolver;
Expand Down Expand Up @@ -175,7 +172,6 @@ private void init() throws Exception {
this.schedulerFactory = new SchedulerFactory();
this.interpreterSettingManager = new InterpreterSettingManager(zconf, depResolver,
new InterpreterOption(true));
this.notebookRepo = new NotebookRepoSync(zconf);
this.noteSearchService = new LuceneSearch();
this.notebookAuthorization = NotebookAuthorization.init(zconf);
this.credentials = new Credentials(zconf.credentialsPersist(), zconf.getCredentialsPath());
Expand Down Expand Up @@ -376,14 +372,6 @@ public Set<Object> getSingletons() {
/** Rest-api root endpoint */
ZeppelinRestApi root = new ZeppelinRestApi();
singletons.add(root);
/*
NotebookRestApi notebookApi =
new NotebookRestApi(notebook, notebookWsServer, noteSearchService);
singletons.add(notebookApi);*/

NotebookRepoRestApi notebookRepoApi =
new NotebookRepoRestApi(notebookRepo);
singletons.add(notebookRepoApi);

HeliumRestApi heliumApi = new HeliumRestApi(helium, notebook);
singletons.add(heliumApi);
Expand Down
16 changes: 0 additions & 16 deletions smart-zeppelin/zeppelin-zengine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,6 @@
<artifactId>commons-logging</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>${commons.vfs2.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.commons.configuration.XMLConfiguration;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.lang.StringUtils;
import org.apache.zeppelin.notebook.repo.GitNotebookRepo;
import org.apache.zeppelin.util.Util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -598,7 +597,7 @@ public static enum ConfVars {
ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING("zeppelin.notebook.azure.connectionString", null),
ZEPPELIN_NOTEBOOK_AZURE_SHARE("zeppelin.notebook.azure.share", "zeppelin"),
ZEPPELIN_NOTEBOOK_AZURE_USER("zeppelin.notebook.azure.user", "user"),
ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", GitNotebookRepo.class.getName()),
ZEPPELIN_NOTEBOOK_STORAGE("zeppelin.notebook.storage", ""),
ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC("zeppelin.notebook.one.way.sync", false),
// whether by default note is public or private
ZEPPELIN_NOTEBOOK_PUBLIC("zeppelin.notebook.public", true),
Expand Down

This file was deleted.

Loading