Merge branch 'master' into ZEPPELIN-953

apache · Jun 4, 2016 · d9ac1f1 · d9ac1f1
2 parents 5cddba6 + 09bc8a3
commit d9ac1f1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 29 deletions.
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -70,6 +70,7 @@
 import scala.tools.nsc.Settings;
 import scala.tools.nsc.interpreter.Completion.Candidates;
 import scala.tools.nsc.interpreter.Completion.ScalaCompleter;
+import scala.tools.nsc.settings.MutableSettings;
 import scala.tools.nsc.settings.MutableSettings.BooleanSetting;
 import scala.tools.nsc.settings.MutableSettings.PathSetting;
 
@@ -462,6 +463,12 @@ public void open() {
 
     System.setProperty("scala.repl.name.line", "line" + this.hashCode() + "$");
 
+    // To prevent 'File name too long' error on some file system.
+    MutableSettings.IntSetting numClassFileSetting = settings.maxClassfileName();
+    numClassFileSetting.v_$eq(128);
+    settings.scala$tools$nsc$settings$ScalaSettings$_setter_$maxClassfileName_$eq(
+        numClassFileSetting);
+
     synchronized (sharedInterpreterLock) {
       /* create scala repl */
       if (printREPLOutput()) {

diff --git a/spark/src/main/scala/org/apache/zeppelin/spark/ZeppelinRDisplay.scala b/spark/src/main/scala/org/apache/zeppelin/spark/ZeppelinRDisplay.scala
@@ -68,18 +68,18 @@ object ZeppelinRDisplay {
   }
 
   private def textDisplay(body: Element): RDisplay = {
-    RDisplay(body.getElementsByTag("p").get(0).html(), TEXT, SUCCESS)
+    RDisplay(body.getElementsByTag("p").first().html(), TEXT, SUCCESS)
   }
 
   private def tableDisplay(body: Element): RDisplay = {
-    val p = body.getElementsByTag("p").get(0).html.replace("“%table " , "").replace("”", "")
+    val p = body.getElementsByTag("p").first().html.replace("“%table " , "").replace("”", "")
     val r = (pattern findFirstIn p).getOrElse("")
     val table = p.replace(r, "").replace("\\t", "\t").replace("\\n", "\n")
     RDisplay(table, TABLE, SUCCESS)
   }
 
   private def imgDisplay(body: Element): RDisplay = {
-    val p = body.getElementsByTag("p").get(0).html.replace("“%img " , "").replace("”", "")
+    val p = body.getElementsByTag("p").first().html.replace("“%img " , "").replace("”", "")
     val r = (pattern findFirstIn p).getOrElse("")
     val img = p.replace(r, "")
     RDisplay(img, IMG, SUCCESS)

diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
@@ -247,12 +247,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-exec</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
 
 
     <dependency> <!-- because there are two of them above  -->

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
@@ -238,8 +238,8 @@ public void testSparkInterpreterDependencyLoading() throws Exception {
       interpreterLink.click();
       driver.findElement(By.xpath("//div[@id='spark']//button[contains(.,'edit')]")).sendKeys(Keys.ENTER);
       WebElement testDepRemoveBtn = pollingWait(By.xpath("//tr[descendant::text()[contains(.,'" +
-          artifact + "')]]/td[3]/div"), MAX_IMPLICIT_WAIT);
-      testDepRemoveBtn.click();
+          artifact + "')]]/td[3]/button"), MAX_IMPLICIT_WAIT);
+      testDepRemoveBtn.sendKeys(Keys.ENTER);
       driver.findElement(By.xpath("//div[@id='spark']//form//button[1]")).click();
       driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'Do you want to update this interpreter and restart with new settings?')]" +
           "//div[@class='modal-footer']//button[contains(.,'OK')]")).click();

diff --git a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
@@ -83,8 +83,8 @@ <h4>Create new interpreter</h4>
             <td><textarea msd-elastic ng-model="value.value"></textarea></td>
             <td>{{value.description}}</td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
+              </button>
             </td>
           </tr>
 
@@ -96,8 +96,8 @@ <h4>Create new interpreter</h4>
             <td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
             <td></td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
+              </button>
             </td>
           </tr>
         </table>
@@ -121,9 +121,9 @@ <h4>Create new interpreter</h4>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterDependency(dep.groupArtifactVersion)">
-              </div>
+              </button>
             </td>
           </tr>
 
@@ -140,8 +140,8 @@ <h4>Create new interpreter</h4>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
+              </button>
             </td>
           </tr>
         </table>

diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -175,9 +175,9 @@ <h5>Properties</h5>
               </span>
             </td>
             <td ng-if="valueform.$visible">
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterProperty(key, setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
           <tr ng-if="valueform.$visible">
@@ -190,9 +190,9 @@ <h5>Properties</h5>
               <textarea msd-elastic ng-model="setting.propertyValue"></textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus"
+              <button class="btn btn-default btn-sm fa fa-plus"
                    ng-click="addNewInterpreterProperty(setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
         </table>
@@ -227,9 +227,9 @@ <h5>Dependencies</h5>
               <div ng-if="!valueform.$visible">{{dep.exclusions.join()}}</div>
             </td>
             <td ng-if="valueform.$visible">
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterDependency(dep.groupArtifactVersion, setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
           <tr ng-if="valueform.$visible">
@@ -246,9 +246,9 @@ <h5>Dependencies</h5>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus"
+              <button class="btn btn-default btn-sm fa fa-plus"
                    ng-click="addNewInterpreterDependency(setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
         </table>

diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
@@ -65,15 +65,17 @@
         <li ng-if="ticket">
         <!--TODO(bzz): move to Typeahead https://angular-ui.github.io/bootstrap  -->
           <form role="search"
-            style="width: 300px; display: inline-block; margin: 0 10px"
+            style="display: inline-block; margin: 0 10px"
+             class="navbar-form"
              ng-submit="search(searchTerm)">
             <div class="input-group">
               <input
                 type="text"
+                style="min-width:300px;"
                 ng-model="searchTerm"
                 ng-disabled="!navbar.connected"
                 class="form-control"
-                placeholder="Search in your notebooks"
+                placeholder="Search your Notebooks"
               />
               <span class="input-group-btn">
                 <button
@@ -86,6 +88,7 @@
               </span>
             </div>
           </form>
+        </li>
         <li class="server-status"  >
           <i class="fa fa-circle" ng-class="{'server-connected':navbar.connected, 'server-disconnected':!navbar.connected}"></i>
         <span ng-show="navbar.connected" ng-if="ticket.principal == 'anonymous' ">Connected</span>