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

ramaswamydevarajan · ramaswamydevarajan · commit f8a992cbc738 · 2016-01-18T21:54:13.000-08:00
diff --git a/conf/shiro.ini b/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
diff --git a/ignite/src/main/resources/default-ignite-jdbc.xml b/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">
diff --git a/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java b/ignite/src/test/java/org/apache/zeppelin/ignite/IgniteSqlInterpreterTest.java
@@ -60,7 +60,6 @@ public void setUp() {
     IgniteConfiguration cfg = new IgniteConfiguration();
     cfg.setDiscoverySpi(discoSpi);
     cfg.setPeerClassLoadingEnabled(true);
-    cfg.setMarshaller(new OptimizedMarshaller());
 
     cfg.setGridName("test");
 
diff --git a/phoenix/pom.xml b/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>
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
@@ -220,7 +220,7 @@ public Object select(String name, Object defaultValue,
       paramOptions[i++] = new ParamOption(valueAndDisplayValue._1(), valueAndDisplayValue._2());
     }
 
-    return gui.select(name, "", paramOptions);
+    return gui.select(name, defaultValue, paramOptions);
   }
 
   public void setGui(GUI o) {
diff --git a/zeppelin-web/src/app/home/home.css b/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 {
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/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;
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/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);
   }
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
@@ -73,8 +73,8 @@
         </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>
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
@@ -78,7 +78,7 @@ public NotebookRepoSync(ZeppelinConfiguration conf) {
       } 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
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java
@@ -64,6 +64,7 @@ public void setUp() throws Exception {
   @After
   public void tearDown() throws Exception {
     delete(tmpDir);
+    Interpreter.registeredInterpreters.clear();
   }
 
   @Test
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -71,7 +71,7 @@ public void setUp() throws Exception {
     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());

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public Object select(String name, Object defaultValue,`
`220`	`220`	`paramOptions[i++] = new ParamOption(valueAndDisplayValue._1(), valueAndDisplayValue._2());`
`221`	`221`	`}`
`222`	`222`
`223`		`- return gui.select(name, "", paramOptions);`
	`223`	`+ return gui.select(name, defaultValue, paramOptions);`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`public void setGui(GUI o) {`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ a.navbar-brand:hover {`
`184`	`184`
`185`	`185`	`.server-status {`
`186`	`186`	`font-size: 12px;`
`187`		`- margin-top: 6px;`
	`187`	`+ margin-top: 8px;`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`.server-connected {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco`
`23`	`23`	`vm.connected = websocketMsgSrv.isConnected();`
`24`	`24`	`vm.websocketMsgSrv = websocketMsgSrv;`
`25`	`25`	`vm.arrayOrderingSrv = arrayOrderingSrv;`
`26`		`- vm.authenticated = $rootScope.ticket.principal !== 'anonymous';`
`27`	`26`
`28`	`27`	`angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});`
`29`	`28`
`@@ -52,8 +51,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco`
`52`	`51`	`websocketMsgSrv.getNotebookList();`
`53`	`52`	`}`
`54`	`53`
`55`		`- vm.authenticated = $rootScope.ticket.principal !== 'anonymous';`
`56`		`-`
`57`	`54`	`function isActive(noteId) {`
`58`	`55`	`return ($routeParams.noteId === noteId);`
`59`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public NotebookRepoSync(ZeppelinConfiguration conf) {`
`78`	`78`	`} catch (ClassNotFoundException \| NoSuchMethodException \| SecurityException \|`
`79`	`79`	`InstantiationException \| IllegalAccessException \| IllegalArgumentException \|`
`80`	`80`	`InvocationTargetException e) {`
`81`		`- LOG.warn("Failed to initialize {} notebook storage class {}", storageClassNames[i], e);`
	`81`	`+ LOG.warn("Failed to initialize {} notebook storage class", storageClassNames[i], e);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`// couldn't initialize any storage, use default`