Merge branch 'master' into elasticFixNativeTypes

Stratio · Aug 31, 2016 · f74136c · f74136c
2 parents 9a41911 + 39fa0d6
commit f74136c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 255 deletions.
diff --git a/zeppelin/README.md b/zeppelin/README.md
@@ -4,26 +4,27 @@ To know more about Zeppelin, visit our web site [http://zeppelin.incubator.apach
 
 ## Requirements
  * Java 1.7
- * Apache Zeppelin 0.6.0-incubating-SNAPSHOT
+ * Apache Zeppelin 0.6.0
  * Maven 
 
 ## Getting Started
 
 # Install Zeppelin
 
-https://github.com/apache/incubator-zeppelin => master
+https://github.com/apache/incubator-zeppelin => git checkout v0.6.0
 
-git checkout 4c269e6d860320e2612eb6b77785c6d1ff3ef106
-
-mvn clean install -DskipTests
+mvn clean package -DskipTests
 
 #### Crossdata Interpreter
 
-From /path/to/crossdata/zeppelin:
+/path/to/zeppelin/bin/install-interpreter.sh --name crossdata -t org.apache.zeppelin:zeppelin-crossdata_2.11:1.6.0-SNAPSHOT
+
+Add interpreter class name ("org.apache.zeppelin.crossdata.CrossdataInterpreter") to 'zeppelin.interpreters' property in your conf/zeppelin-site.xml file
+
+Start Zeppelin
 
-mvn clean install
+Create interpreter setting in 'Interpreter' menu on GUI. And then you can bind interpreter on your notebook
 
-scripts/add-crossdata-interpreter.sh /path/to/zeppelin_home 
 
 ### Configure
 

diff --git a/zeppelin/files/zeppelin-site.xml b/zeppelin/files/zeppelin-site.xml
diff --git a/zeppelin/pom.xml b/zeppelin/pom.xml
@@ -22,12 +22,12 @@
   <parent>
     <artifactId>zeppelin</artifactId>
     <groupId>org.apache.zeppelin</groupId>
-    <version>0.6.0-incubating-SNAPSHOT</version>
+    <version>0.6.0</version>
   </parent>
 
-  <artifactId>zeppelin-crossdata_2.10</artifactId>
+  <artifactId>zeppelin-crossdata_2.11</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.6.0-SNAPSHOT</version>
   <name>Zeppelin: Crossdata</name>
   <description>Zeppelin interpreter for Crossdata</description>
   <url>https://github.com/Stratio/Crossdata</url>
@@ -36,12 +36,8 @@
     <zeppelin.home>zeppelin_home</zeppelin.home>
     <crossdata.version>${project.version}</crossdata.version>
     <!-- Scala version and cross build properties -->
-    <scala.binary.version>2.10</scala.binary.version>
-    <scala.version>2.10.4</scala.version>
-    <scala_2.10.version>2.10.4</scala_2.10.version>
-    <scala_2.11.version>2.11.8</scala_2.11.version>
-    <default.scala.binary.version>2.10</default.scala.binary.version>
-    <default.scala.version>${scala_2.10.version}</default.scala.version>
+    <scala.binary.version>2.11</scala.binary.version>
+    <scala.version>2.11.8</scala.version>
   </properties>
 
   <dependencies>
@@ -229,21 +225,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>scala-2.10</id>
-      <properties>
-        <scala.version>${scala_2.10.version}</scala.version>
-        <scala.binary.version>2.10</scala.binary.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>scala-2.11</id>
-      <properties>
-        <scala.version>${scala_2.11.version}</scala.version>
-        <scala.binary.version>2.11</scala.binary.version>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/zeppelin/scripts/add-crossdata-interpreter.sh b/zeppelin/scripts/add-crossdata-interpreter.sh
diff --git a/zeppelin/src/main/java/org/apache/zeppelin/crossdata/CrossdataInterpreter.java b/zeppelin/src/main/java/org/apache/zeppelin/crossdata/CrossdataInterpreter.java
@@ -24,7 +24,6 @@
 import org.apache.spark.sql.types.StructType;
 import org.apache.zeppelin.interpreter.Interpreter;
 import org.apache.zeppelin.interpreter.InterpreterContext;
-import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.scheduler.Scheduler;
 import org.apache.zeppelin.scheduler.SchedulerFactory;
@@ -43,19 +42,8 @@ public class CrossdataInterpreter extends Interpreter {
 
     private static final String CROSSDATA_SEEDS_PROPERTY = "crossdata.seeds";
     private static final String CROSSDATA_DEFAULT_LIMIT = "crossdata.defaultLimit";
-    private static final String CROSSDATA_TIMEOUT_SEC = "crossdata.tiemoutSeconds";
-
-
-    static {
-        Interpreter.register(
-                "crossdata",
-                "crossdata",
-                CrossdataInterpreter.class.getName(),
-                new InterpreterPropertyBuilder()
-                        .add(CROSSDATA_SEEDS_PROPERTY, "127.0.0.1:13420", "The list of seeds.")
-                        .add(CROSSDATA_DEFAULT_LIMIT, "1000", "Default limit")
-                        .add(CROSSDATA_TIMEOUT_SEC, "100", "Query tiemout in seconds (0 means infinite timeout)").build());
-    }
+    private static final String CROSSDATA_TIMEOUT_SEC = "crossdata.timeoutSeconds";
+
 
     public CrossdataInterpreter(Properties property) {
         super(property);
@@ -170,10 +158,6 @@ public int getProgress(InterpreterContext context) {
         return 0;
     }
 
-    @Override
-    public List<String> completion(String buf, int cursor) {
-        return null;
-    }
 
     @Override
     public Scheduler getScheduler() {

diff --git a/zeppelin/src/main/resources/interpreter-setting.json b/zeppelin/src/main/resources/interpreter-setting.json
@@ -0,0 +1,27 @@
+[
+  {
+    "group": "crossdata",
+    "name": "crossdata",
+    "className": "org.apache.zeppelin.crossdata.CrossdataInterpreter",
+    "properties": {
+      "crossdata.seeds": {
+        "envName": "ZEPPELIN_SPARK_CONCURRENTSQL",
+        "propertyName": "crossdata.seeds",
+        "defaultValue": "127.0.0.1:13420",
+        "description": "The list of seeds."
+      },
+      "crossdata.timeoutSeconds": {
+        "envName": "CROSSDATA_TIMEOUT_SEC",
+        "propertyName": "crossdata.timeoutSeconds",
+        "defaultValue": "100",
+        "description": "Query timeout in seconds (0 means infinite timeout)"
+      },
+      "crossdata.defaultLimit": {
+        "envName": "CROSSDATA_DEFAULT_LIMIT",
+        "propertyName": "crossdata.defaultLimit",
+        "defaultValue": "1000",
+        "description": "Default limit"
+      }
+    }
+  }
+]