Merge branch 'master' of git@github.com:swakrish/incubator-zeppelin.git

conf/shiro.ini

@@ -22,9 +22,14 @@ admin = password1
 user1 = password2
 user2 = password3
 
+# Sample LDAP configuration, for user Authentication, currently tested for single Realm
+[main]
+#ldapRealm = org.apache.shiro.realm.ldap.JndiLdapRealm
+#ldapRealm.userDnTemplate = cn={0},cn=engg,ou=testdomain,dc=testdomain,dc=com
+#ldapRealm.contextFactory.url = ldap://ldaphost:389
+#ldapRealm.contextFactory.authenticationMechanism = SIMPLE
 
 [urls]
-
 # anon means the access is anonymous.
 # authcBasic means Basic Auth Security
 # To enfore security, comment the line below and uncomment the next one

ignite/src/main/resources/default-ignite-jdbc.xml

@@ -33,13 +33,6 @@
 
         <property name="peerClassLoadingEnabled" value="true"/>
 
-        <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller">
-                <!-- Set to false to allow non-serializable objects in examples, default is true. -->
-                <property name="requireSerializable" value="false"/>
-            </bean>
-        </property>
-
         <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
         <property name="discoverySpi">
             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">

ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java

@@ -60,7 +60,6 @@ public class IgniteSqlInterpreterTest {
     IgniteConfiguration cfg = new IgniteConfiguration();
     cfg.setDiscoverySpi(discoSpi);
     cfg.setPeerClassLoadingEnabled(true);
-    cfg.setMarshaller(new OptimizedMarshaller());
 
     cfg.setGridName("test");
 

phoenix/pom.xml

@@ -45,6 +45,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>sqlline</groupId>
+      <artifactId>sqlline</artifactId>
+      <version>1.1.9</version>
+    </dependency>  
+
     <dependency>
       <groupId>org.apache.phoenix</groupId>
       <artifactId>phoenix-core</artifactId>

spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java

@@ -220,7 +220,7 @@ public class ZeppelinContext extends HashMap<String, Object> {
       paramOptions[i++] = new ParamOption(valueAndDisplayValue._1(), valueAndDisplayValue._2());
     }
 
-    return gui.select(name, "", paramOptions);
+    return gui.select(name, defaultValue, paramOptions);
   }
 
   public void setGui(GUI o) {

zeppelin-web/src/app/home/home.css

@@ -184,7 +184,7 @@ a.navbar-brand:hover {
 
 .server-status {
   font-size: 12px;
-  margin-top: 6px;
+  margin-top: 8px;
 }
 
 .server-connected {

zeppelin-web/src/app/notebook/paragraph/paragraph.css

@@ -202,7 +202,6 @@
   font-weight: bold;
   font-family: 'Roboto', sans-serif;
   font-size: 17px !important;
-  text-transform: capitalize;
 }
 
 .paragraph .title input {
@@ -215,7 +214,6 @@
   border-radius: 0;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  text-transform: capitalize;
   font-family: 'Roboto', sans-serif;
   font-size: 17px !important;
   font-weight: bold;

zeppelin-web/src/components/navbar/navbar.controller.js

@@ -23,7 +23,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
   vm.connected = websocketMsgSrv.isConnected();
   vm.websocketMsgSrv = websocketMsgSrv;
   vm.arrayOrderingSrv = arrayOrderingSrv;
-  vm.authenticated = $rootScope.ticket.principal !== 'anonymous';
 
   angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
 
@@ -52,8 +51,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
     websocketMsgSrv.getNotebookList();
   }
 
-  vm.authenticated = $rootScope.ticket.principal !== 'anonymous';
-
   function isActive(noteId) {
     return ($routeParams.noteId === noteId);
   }

zeppelin-web/src/components/navbar/navbar.html

@@ -73,8 +73,8 @@ limitations under the License.
         </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.authenticated">{{ticket.principal}} connected</span>
-          <span ng-show="!navbar.authenticated">Disconnected</span>
+          <span ng-show="navbar.connected">Connected</span>
+          <span ng-show="!navbar.connected">Disconnected</span>
         </li>
       </ul>
     </div>

zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java

@@ -78,7 +78,7 @@ public class NotebookRepoSync implements NotebookRepo {
       } catch (ClassNotFoundException | NoSuchMethodException | SecurityException |
           InstantiationException | IllegalAccessException | IllegalArgumentException |
           InvocationTargetException e) {
-        LOG.warn("Failed to initialize {} notebook storage class {}", storageClassNames[i], e);
+        LOG.warn("Failed to initialize {} notebook storage class", storageClassNames[i], e);
       }
     }
     // couldn't initialize any storage, use default

zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java

@@ -64,6 +64,7 @@ public class NoteInterpreterLoaderTest {
   @After
   public void tearDown() throws Exception {
     delete(tmpDir);
+    Interpreter.registeredInterpreters.clear();
   }
 
   @Test

zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java

@@ -71,7 +71,7 @@ public class NotebookTest implements JobListenerFactory{
     tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis());
     tmpDir.mkdirs();
     new File(tmpDir, "conf").mkdirs();
-    notebookDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis()+"/notebook");
+    notebookDir = new File(tmpDir + "/notebook");
     notebookDir.mkdirs();
 
     System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), tmpDir.getAbsolutePath());