From commits-return-4722-archive-asf-public=cust-asf.ponee.io@zeppelin.apache.org Thu Jul 26 02:33:18 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 67D3218062C for ; Thu, 26 Jul 2018 02:33:18 +0200 (CEST) Received: (qmail 48515 invoked by uid 500); 26 Jul 2018 00:33:17 -0000 Mailing-List: contact commits-help@zeppelin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zeppelin.apache.org Delivered-To: mailing list commits@zeppelin.apache.org Received: (qmail 48506 invoked by uid 99); 26 Jul 2018 00:33:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2018 00:33:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60C6ADFC42; Thu, 26 Jul 2018 00:33:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjffdu@apache.org To: commits@zeppelin.apache.org Message-Id: <43db9bc1cf694a93beb787d1ae2085e1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zeppelin git commit: ZEPPELIN-3661. Remove property zeppelin.interpreters Date: Thu, 26 Jul 2018 00:33:17 +0000 (UTC) Repository: zeppelin Updated Branches: refs/heads/master 8769d41ad -> 3e641d95c ZEPPELIN-3661. Remove property zeppelin.interpreters ### What is this PR for? This PR is to remove property `zeppelin.interpreters` which is not used anymore. ### What type of PR is it? [Refactoring] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-3661 ### How should this be tested? * CI pass ### 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: Jeff Zhang Closes #3096 from zjffdu/ZEPPELIN-3661 and squashes the following commits: 0b27eadca [Jeff Zhang] ZEPPELIN-3661. Remove property zeppelin.interpreters Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3e641d95 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3e641d95 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3e641d95 Branch: refs/heads/master Commit: 3e641d95cbb2a451932a5f80ed7ec9fa8b7ba00b Parents: 8769d41 Author: Jeff Zhang Authored: Wed Jul 25 15:22:36 2018 +0800 Committer: Jeff Zhang Committed: Thu Jul 26 08:33:01 2018 +0800 ---------------------------------------------------------------------- .../zeppelin/conf/ZeppelinConfiguration.java | 42 +------------------- .../zeppelin/rest/AbstractTestRestApi.java | 23 +---------- 2 files changed, 2 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3e641d95/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index 32a149a..d63eb01 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -693,47 +693,7 @@ public class ZeppelinConfiguration extends XMLConfiguration { ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null), 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," - + "org.apache.zeppelin.rinterpreter.RRepl," - + "org.apache.zeppelin.rinterpreter.KnitR," - + "org.apache.zeppelin.spark.SparkRInterpreter," - + "org.apache.zeppelin.spark.SparkSqlInterpreter," - + "org.apache.zeppelin.spark.DepInterpreter," - + "org.apache.zeppelin.markdown.Markdown," - + "org.apache.zeppelin.angular.AngularInterpreter," - + "org.apache.zeppelin.shell.ShellInterpreter," - + "org.apache.zeppelin.livy.LivySparkInterpreter," - + "org.apache.zeppelin.livy.LivySparkSQLInterpreter," - + "org.apache.zeppelin.livy.LivyPySparkInterpreter," - + "org.apache.zeppelin.livy.LivyPySpark3Interpreter," - + "org.apache.zeppelin.livy.LivySparkRInterpreter," - + "org.apache.zeppelin.alluxio.AlluxioInterpreter," - + "org.apache.zeppelin.file.HDFSFileInterpreter," - + "org.apache.zeppelin.pig.PigInterpreter," - + "org.apache.zeppelin.pig.PigQueryInterpreter," - + "org.apache.zeppelin.flink.FlinkInterpreter," - + "org.apache.zeppelin.python.PythonInterpreter," - + "org.apache.zeppelin.python.PythonInterpreterPandasSql," - + "org.apache.zeppelin.python.PythonCondaInterpreter," - + "org.apache.zeppelin.python.PythonDockerInterpreter," - + "org.apache.zeppelin.ignite.IgniteInterpreter," - + "org.apache.zeppelin.ignite.IgniteSqlInterpreter," - + "org.apache.zeppelin.lens.LensInterpreter," - + "org.apache.zeppelin.cassandra.CassandraInterpreter," - + "org.apache.zeppelin.geode.GeodeOqlInterpreter," - + "org.apache.zeppelin.kylin.KylinInterpreter," - + "org.apache.zeppelin.elasticsearch.ElasticsearchInterpreter," - + "org.apache.zeppelin.scalding.ScaldingInterpreter," - + "org.apache.zeppelin.jdbc.JDBCInterpreter," - + "org.apache.zeppelin.hbase.HbaseInterpreter," - + "org.apache.zeppelin.bigquery.BigQueryInterpreter," - + "org.apache.zeppelin.beam.BeamInterpreter," - + "org.apache.zeppelin.scio.ScioInterpreter," - + "org.apache.zeppelin.groovy.GroovyInterpreter," - + "org.apache.zeppelin.neo4j.Neo4jCypherInterpreter," - + "org.apache.zeppelin.sap.UniverseInterpreter" - ), + ZEPPELIN_INTERPRETER_JSON("zeppelin.interpreter.setting", "interpreter-setting.json"), ZEPPELIN_INTERPRETER_DIR("zeppelin.interpreter.dir", "interpreter"), ZEPPELIN_INTERPRETER_LOCALREPO("zeppelin.interpreter.localRepo", "local-repo"), http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3e641d95/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 80165ff..f7d6f17 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 @@ -214,26 +214,6 @@ public abstract class AbstractTestRestApi { } - // exclude org.apache.zeppelin.rinterpreter.* for scala 2.11 test - String interpreters = conf.getString(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETERS); - String interpretersCompatibleWithScala211Test = null; - - for (String intp : interpreters.split(",")) { - if (intp.startsWith("org.apache.zeppelin.rinterpreter")) { - continue; - } - - if (interpretersCompatibleWithScala211Test == null) { - interpretersCompatibleWithScala211Test = intp; - } else { - interpretersCompatibleWithScala211Test += "," + intp; - } - } - - System.setProperty( - ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETERS.getVarName(), - interpretersCompatibleWithScala211Test); - executor = Executors.newSingleThreadExecutor(); executor.submit(SERVER); long s = System.currentTimeMillis(); @@ -309,8 +289,7 @@ public abstract class AbstractTestRestApi { } LOG.info("Test Zeppelin terminated."); - - System.clearProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETERS.getVarName()); + if (isRunningWithAuth) { isRunningWithAuth = false; System