Merge branch 'master' of github.com:azkaban/azkaban2

Author: erwa

src/java/azkaban/project/Project.java

@@ -265,17 +265,6 @@ public Object toObject() {
 			projectObject.put("metadata", metadata);
 		}
 
-		ArrayList<Map<String, Object>> users = new ArrayList<Map<String, Object>>();
-		for (Map.Entry<String, Permission> entry : userPermissionMap.entrySet()) {
-			HashMap<String, Object> userMap = new HashMap<String, Object>();
-			userMap.put("userId", entry.getKey());
-			userMap.put("permissions", entry.getValue().toStringArray());
-			users.add(userMap);
-		}
-		
-		projectObject.put("users", users);
-		
-
 		ArrayList<String> proxyUserList = new ArrayList<String>(proxyUsers);
 		projectObject.put("proxyUsers", proxyUserList);
 
@@ -312,18 +301,6 @@ public static Project projectFromObject(Object object) {
 			project.setMetadata(metadata);
 		}
 
-		List<Map<String, Object>> users = (List<Map<String, Object>>) projectObject
-				.get("users");
-
-		for (Map<String, Object> user : users) {
-			String userid = (String) user.get("userId");
-			Permission perm = new Permission();
-			List<String> list = (List<String>) user.get("permissions");
-			perm.addPermissionsByName(list);
-
-			project.setUserPermission(userid, perm);
-		}
-		
 		List<String> proxyUserList = (List<String>) projectObject.get("proxyUsers");
 		project.addAllProxyUsers(proxyUserList);
 

src/less/flow.less

@@ -1,10 +1,20 @@
+#svgDiv {
+    height: 100%;
+    padding: 0px;
+}
+
 #graphView {
    -moz-user-select: none;
    -khtml-user-select: none;
    -webkit-user-select: none;
    user-select: none;
 }
 
+#flow-graph {
+    width: 100%;
+    height: 100%;
+}
+
 #headertabs {
    -moz-user-select: none;
    -khtml-user-select: none;

src/package/execserver/bin/azkaban-executor-start.sh

@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-	for file in $HADOOP_HOME/hadoop-core*.jar ;
-	do
-		CLASSPATH=$CLASSPATH:$file
-	done
-	CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-	echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;

src/package/soloserver/bin/azkaban-solo-start.sh

@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-    for file in $HADOOP_HOME/hadoop-core*.jar ;
-    do
-        CLASSPATH=$CLASSPATH:$file
-    done
-    CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-    echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;

src/package/webserver/bin/azkaban-web-start.sh

@@ -22,18 +22,16 @@ do
 done
 
 if [ "HADOOP_HOME" != "" ]; then
-    for file in $HADOOP_HOME/hadoop-core*.jar;
-    do
-        CLASSPATH=$CLASSPATH:$file
-    done
-    CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf
-    JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
+        echo "Using Hadoop from $HADOOP_HOME"
+        CLASSPATH=$CLASSPATH:$HADOOP_HOME/conf:$HADOOP_HOME/*
+        JAVA_LIB_PATH="-Djava.library.path=$HADOOP_HOME/lib/native/Linux-amd64-64"
 else
-    echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
+        echo "Error: HADOOP_HOME is not set. Hadoop job types will not run properly."
 fi
 
 if [ "HIVE_HOME" != "" ]; then
-    CLASSPATH=$CLASSPATH:$HIVE_HOME/conf
+        echo "Using Hive from $HIVE_HOME"
+        CLASSPATH=$CLASSPATH:$HIVE_HOME/conf:$HIVE_HOME/lib/*
 fi
 
 echo $azkaban_dir;

src/web/js/azkaban/util/flow-loader.js

@@ -151,9 +151,8 @@ var edgeClickCallback = function(event, model) {
 
 var graphClickCallback = function(event, model) {
 	console.log("Graph clicked callback");
-
-	var jobId = event.currentTarget.jobid;
-	var flowId = model.get("flowId");
+	var data = model.get("data");
+	var flowId = data.flow;
 	var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId;
 
 	var menu = [