You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/05/18 21:19:50 UTC
incubator-asterixdb git commit: ASTERIXDB-1287: Fixed Admin Console
pages.
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 5e1226637 -> 72f81a6f8
ASTERIXDB-1287: Fixed Admin Console pages.
From: Pritom Ahmed <pr...@gmail.com>:
Previously job details page of the admin console was not working correctly.
Now It is fixed. Also fixed some internal issues like wrong time shown.
Now JSON data in adminconsole for Job Details is shown in tabular form.
Previously, in job details page of admin console, all the data was shown
in raw JSON format. Now using a MIT licensed js library, it is shown in
tabular form.
Added Headers for the data shown in Index page of adminconsole.
Previously in job summary, create time, start time and end time was never
updated. As a result they all were 0. Fixed it.
In adminconsole's Index page, the job create time, start time and end
time all were being assigned with create time. Fixed it. The same
problem was also present in the REST API as well. Also fixed it.
Showing a message in job details page in admin console for jobs that
were deleted because the maximum size of job archive was reached.
Beautified the job details page in adminconsole by adding tabs.
Fixed the job details page in adminconsole. Previously it was broken.
Now it shows the raw JSON data sent to it.
Change-Id: Iefbdd9ab564cff12ab75e00922299fbbcde1c08f
Reviewed-on: https://asterix-gerrit.ics.uci.edu/860
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <im...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/72f81a6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/72f81a6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/72f81a6f
Branch: refs/heads/master
Commit: 72f81a6f88d0ef96e8c22acdac019bc2823e2263
Parents: 5e12266
Author: Till Westmann <ti...@apache.org>
Authored: Tue May 17 20:37:00 2016 -0700
Committer: Till Westmann <ti...@apache.org>
Committed: Wed May 18 14:19:51 2016 -0700
----------------------------------------------------------------------
.../main/appended-resources/META-INF/LICENSE | 55 +++
.../cc/adminconsole/pages/IndexPage.java | 17 +-
.../cc/adminconsole/pages/JobDetailsPage.java | 20 +-
.../apache/hyracks/control/cc/job/JobRun.java | 5 +-
.../control/cc/scheduler/JobScheduler.java | 1 +
.../cc/work/GetJobSummariesJSONWork.java | 4 +-
.../hyracks/control/cc/work/JobCleanupWork.java | 1 +
.../hyracks/control/cc/work/JobStartWork.java | 1 +
.../cc/work/JobletCleanupNotificationWork.java | 1 +
.../cc/adminconsole/pages/AbstractPage.html | 1 +
.../cc/adminconsole/pages/IndexPage.html | 15 +-
.../cc/adminconsole/pages/JobDetailsPage.html | 66 +++-
.../javascript/adminconsole/JobDetailsPage.js | 4 +-
.../javascript/adminconsole/json.human.js | 395 +++++++++++++++++++
.../resources/static/stylesheet/json.human.css | 146 +++++++
hyracks-fullstack/pom.xml | 56 ++-
16 files changed, 734 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
index 2032bbd..b4b85af 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
@@ -129,3 +129,58 @@ static/javascript/jquery/plugins/jquery.timer.js
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+and also the Hyracks adminconsole resource at:
+static/stylesheet/json.human.css
+
+ json.human.css
+
+ MIT License:
+
+ Copyright (c) 2015, Mariano Guerra
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+and also the Hyracks adminconsole resource at:
+static/javascript/adminconsole/json.human.js
+
+ json.human.js
+
+ MIT License:
+
+ Copyright (c) 2015, Mariano Guerra
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.java
index 224ecd7..709e406 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.java
@@ -32,6 +32,9 @@ import org.apache.hyracks.control.cc.web.util.JSONUtils;
import org.apache.hyracks.control.cc.work.GetJobSummariesJSONWork;
import org.apache.hyracks.control.cc.work.GetNodeSummariesJSONWork;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
public class IndexPage extends AbstractPage {
private static final long serialVersionUID = 1L;
@@ -74,9 +77,9 @@ public class IndexPage extends AbstractPage {
try {
item.add(new Label("job-id", o.getString("job-id")));
item.add(new Label("status", o.getString("status")));
- item.add(new Label("create-time", o.getString("create-time")));
- item.add(new Label("start-time", o.getString("start-time")));
- item.add(new Label("end-time", o.getString("end-time")));
+ item.add(new Label("create-time", longToDateString(Long.parseLong(o.getString("create-time")))));
+ item.add(new Label("start-time", longToDateString(Long.parseLong(o.getString("start-time")))));
+ item.add(new Label("end-time", longToDateString(Long.parseLong(o.getString("end-time")))));
PageParameters params = new PageParameters();
params.add("job-id", o.getString("job-id"));
item.add(new BookmarkablePageLink<Object>("job-details", JobDetailsPage.class, params));
@@ -87,4 +90,10 @@ public class IndexPage extends AbstractPage {
};
add(jobList);
}
-}
+
+ private String longToDateString(long milliseconds) {
+ SimpleDateFormat sdf = new SimpleDateFormat("MMM dd,yyyy HH:mm:ss");
+ Date date = new Date(milliseconds);
+ return sdf.format(date);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.java
index aff8719..7898122 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.java
@@ -61,14 +61,20 @@ public class JobDetailsPage extends AbstractPage {
JSONObject jagO = gacgw.getJSON();
Map<ActivityId, String> activityMap = new HashMap<ActivityId, String>();
- if (jagO.has("activities")) {
- JSONArray aArray = jagO.getJSONArray("activities");
- for (int i = 0; i < aArray.length(); ++i) {
- JSONObject aO = aArray.getJSONObject(i);
- ActivityId aid = ActivityId.parse(aO.getString("id"));
- String className = aO.getString("java-class");
+ if (jagO.has("activity-clusters")) {
+ JSONArray acArray = jagO.getJSONArray("activity-clusters");
+ for (int j = 0; j < acArray.length(); ++j) {
+ JSONObject acO = acArray.getJSONObject(j);
+ if (acO.has("activities")) {
+ JSONArray aArray = acO.getJSONArray("activities");
+ for (int i = 0; i < aArray.length(); ++i) {
+ JSONObject aO = aArray.getJSONObject(i);
+ ActivityId aid = ActivityId.parse(aO.getString("id"));
+ String className = aO.getString("java-class");
- activityMap.put(aid, className);
+ activityMap.put(aid, className);
+ }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
index 0d3367c..dbe4202 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
@@ -110,6 +110,7 @@ public class JobRun implements IJobStatusConditionVariable {
profile = new JobProfile(jobId);
connectorPolicyMap = new HashMap<ConnectorDescriptorId, IConnectorPolicy>();
operatorLocations = new HashMap<OperatorDescriptorId, Map<Integer, String>>();
+ createTime = System.currentTimeMillis();
}
public DeploymentId getDeploymentId() {
@@ -242,8 +243,8 @@ public class JobRun implements IJobStatusConditionVariable {
result.put("job-id", jobId.toString());
result.put("status", getStatus());
result.put("create-time", getCreateTime());
- result.put("start-time", getCreateTime());
- result.put("end-time", getCreateTime());
+ result.put("start-time", getStartTime());
+ result.put("end-time", getEndTime());
JSONArray aClusters = new JSONArray();
for (ActivityCluster ac : acg.getActivityClusterMap().values()) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java
index 5813700..b377b1a 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/scheduler/JobScheduler.java
@@ -722,6 +722,7 @@ public class JobScheduler {
}
}
run.setStatus(run.getPendingStatus(), run.getPendingExceptions());
+ run.setEndTime(System.currentTimeMillis());
ccs.getActiveRunMap().remove(jobId);
ccs.getRunMapArchive().put(jobId, run);
ccs.getRunHistory().put(jobId, run.getExceptions());
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java
index f71a701..bc4468a 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/GetJobSummariesJSONWork.java
@@ -49,8 +49,8 @@ public class GetJobSummariesJSONWork extends SynchronizableWork {
jo.put("type", "job-summary");
jo.put("job-id", run.getJobId().toString());
jo.put("create-time", run.getCreateTime());
- jo.put("start-time", run.getCreateTime());
- jo.put("end-time", run.getCreateTime());
+ jo.put("start-time", run.getStartTime());
+ jo.put("end-time", run.getEndTime());
jo.put("status", run.getStatus().toString());
summaries.put(jo);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
index 10da691..bd85463 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
@@ -106,6 +106,7 @@ public class JobCleanupWork extends AbstractWork {
}
}
run.setStatus(run.getPendingStatus(), run.getPendingExceptions());
+ run.setEndTime(System.currentTimeMillis());
ccs.getActiveRunMap().remove(jobId);
ccs.getRunMapArchive().put(jobId, run);
ccs.getRunHistory().put(jobId, run.getExceptions());
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
index e145aad..e7844e9 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
@@ -61,6 +61,7 @@ public class JobStartWork extends SynchronizableWork {
IActivityClusterGraphGenerator acgg = acggf.createActivityClusterGraphGenerator(jobId, appCtx, jobFlags);
JobRun run = new JobRun(ccs, deploymentId, jobId, acgg, jobFlags);
run.setStatus(JobStatus.INITIALIZED, null);
+ run.setStartTime(System.currentTimeMillis());
ccs.getActiveRunMap().put(jobId, run);
appCtx.notifyJobCreation(jobId, acggf);
run.setStatus(JobStatus.RUNNING, null);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java
index 40a1c29..603b6f8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobletCleanupNotificationWork.java
@@ -68,6 +68,7 @@ public class JobletCleanupNotificationWork extends AbstractHeartbeatWork {
}
}
run.setStatus(run.getPendingStatus(), run.getPendingExceptions());
+ run.setEndTime(System.currentTimeMillis());
ccs.getActiveRunMap().remove(jobId);
ccs.getRunMapArchive().put(jobId, run);
ccs.getRunHistory().put(jobId, run.getExceptions());
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html
index a30e024..ecd0edf 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/AbstractPage.html
@@ -28,6 +28,7 @@
<script type="text/javascript" src="/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js"></script>
<link rel="stylesheet" type="text/css" href="/static/stylesheet/jquery-ui/themes/base/jquery-ui.css"></link>
<link rel="stylesheet" type="text/css" href="/static/stylesheet/adminconsole.css"></link>
+ <link rel="stylesheet" type="text/css" href="/static/stylesheet/json.human.css">
</head>
<body>
<div id="header">
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.html
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.html b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.html
index d8a9e13..bdba2cb 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.html
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/IndexPage.html
@@ -19,9 +19,15 @@
<wicket:extend xmlns:wicket>
<div>
- Registered Node Count: <span wicket:id="node-count"></span>
+ <b>Registered Node Count:</b> <span wicket:id="node-count"></span>
</div>
<table>
+ <tr>
+ <th>Node ID</th>
+ <th>Heap Used</th>
+ <th>System Load Average</th>
+ <th>Node Details</th>
+ </tr>
<tr wicket:id="node-list">
<td>
<span wicket:id="node-id"></span>
@@ -38,6 +44,13 @@
</tr>
</table>
<table>
+ <tr>
+ <th>JOB ID</th>
+ <th>Status</th>
+ <th>Create Time</th>
+ <th>Start Time</th>
+ <th>Job Details</th>
+ </tr>
<tr wicket:id="jobs-list">
<td>
<span wicket:id="job-id"></span>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
index 356f440..468d937 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/org/apache/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
@@ -18,14 +18,66 @@
!-->
<wicket:extend xmlns:wicket>
- <div id="job-specification" wicket:id="job-specification" style="display: none;">
- </div>
- <div id="job-activity-graph" wicket:id="job-activity-graph" style="display: none;">
- </div>
- <div id="job-run" wicket:id="job-run" style="display: none;">
+ <div id="tabs">
+ <ul>
+ <li><a href="#tabs-1">Activity Cluster Graph</a></li>
+ <li><a href="#tabs-2">Job Run</a></li>
+ <li><a href="#tabs-3">Job Timeline</a></li>
+ </ul>
+
+ <div id="tabs-1">
+ <table>
+ <tr>
+ <td>
+ <div>
+ <div id="activityclustergraph" wicket:id="activity-cluster-graph" style="display: none;"></div>
+ <div id="activityclustergraphpre"></div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="tabs-2">
+ <table>
+ <tr>
+ <td>
+ <div>
+ <div id="jobrun" wicket:id="job-run" style="display: none;"></div>
+ <div id="jobrunpre"></div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="tabs-3">
+ <table>
+ <tr>
+ <td>
+ <div wicket:id="job-timeline" style="overflow: auto;"></div>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
- <div wicket:id="job-timeline" style="overflow: auto;"></div>
- <div id="job-graph" style="position:relative"></div>
+
+ <script src="/static/javascript/adminconsole/json.human.js" type="text/javascript"></script>
+
+ <script>
+ var jobRun = JsonHuman.format(jQuery.parseJSON($('#jobrun')[0].innerHTML));
+ $('#jobrunpre').append(jobRun);
+
+ var activityGraph = JsonHuman.format(jQuery.parseJSON($('#activityclustergraph')[0].innerHTML));
+ $('#activityclustergraphpre').append(activityGraph);
+
+ if ($('#jobrun')[0].innerHTML == '{}') {
+ $('#jobrunpre')[0].innerHTML = "<b>Job is too old so it was cleared</b>";
+ }
+ if ($('#activityclustergraph')[0].innerHTML == '{}') {
+ $('#activityclustergraphpre')[0].innerHTML = "<b>Job is too old so it was cleared</b>";
+ }
+ </script>
<script src="/static/javascript/adminconsole/Graphs.js" type="text/javascript"></script>
<script src="/static/javascript/adminconsole/JobDetailsPage.js" type="text/javascript"></script>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js
index 8f67ec9..89f6032 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/JobDetailsPage.js
@@ -17,6 +17,8 @@
* under the License.
*/
$(function() {
+ $('#tabs').tabs();
+
var jobSpecDAG = new Graphs.DAG();
var jobSpecRenderer;
@@ -94,7 +96,7 @@
}
function init() {
- fetchJobSpecification();
+ fetchJobActivityGraph();
}
jsPlumb.bind("ready", function() {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js
new file mode 100644
index 0000000..0ddd80c
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/json.human.js
@@ -0,0 +1,395 @@
+// MIT License:
+//
+// Copyright (c) 2015, Mariano Guerra
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+/*globals define, module, require, document*/
+(function (root, factory) {
+ "use strict";
+ if (typeof define === 'function' && define.amd) {
+ define([], factory);
+ } else if (typeof module !== 'undefined' && module.exports) {
+ module.exports = factory();
+ } else {
+ root.JsonHuman = factory();
+ }
+}(this, function () {
+ "use strict";
+
+ var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+ function makePrefixer(prefix) {
+ return function (name) {
+ return prefix + "-" + name;
+ };
+ }
+
+ function isArray(obj) {
+ return toString.call(obj) === '[object Array]';
+ }
+
+ function sn(tagName, className, data) {
+ var result = document.createElement(tagName);
+
+ result.className = className;
+ result.appendChild(document.createTextNode("" + data));
+
+ return result;
+ }
+
+ function scn(tagName, className, child) {
+ var result = document.createElement(tagName),
+ i, len;
+
+ result.className = className;
+
+ if (isArray(child)) {
+ for (i = 0, len = child.length; i < len; i += 1) {
+ result.appendChild(child[i]);
+ }
+ } else {
+ result.appendChild(child);
+ }
+
+ return result;
+ }
+
+ function linkNode(child, href, target){
+ var a = scn("a", HYPERLINK_CLASS_NAME, child);
+ a.setAttribute('href', href);
+ a.setAttribute('target', target);
+ return a;
+ }
+
+ var toString = Object.prototype.toString,
+ prefixer = makePrefixer("jh"),
+ p = prefixer,
+ ARRAY = 1,
+ BOOL = 2,
+ INT = 3,
+ FLOAT = 4,
+ STRING = 5,
+ OBJECT = 6,
+ FUNCTION = 7,
+ UNK = 99,
+
+ STRING_CLASS_NAME = p("type-string"),
+ STRING_EMPTY_CLASS_NAME = p("type-string") + " " + p("empty"),
+
+ BOOL_TRUE_CLASS_NAME = p("type-bool-true"),
+ BOOL_FALSE_CLASS_NAME = p("type-bool-false"),
+ BOOL_IMAGE = p("type-bool-image"),
+ INT_CLASS_NAME = p("type-int") + " " + p("type-number"),
+ FLOAT_CLASS_NAME = p("type-float") + " " + p("type-number"),
+
+ OBJECT_CLASS_NAME = p("type-object"),
+ OBJ_KEY_CLASS_NAME = p("key") + " " + p("object-key"),
+ OBJ_VAL_CLASS_NAME = p("value") + " " + p("object-value"),
+ OBJ_EMPTY_CLASS_NAME = p("type-object") + " " + p("empty"),
+
+ FUNCTION_CLASS_NAME = p("type-function"),
+
+ ARRAY_KEY_CLASS_NAME = p("key") + " " + p("array-key"),
+ ARRAY_VAL_CLASS_NAME = p("value") + " " + p("array-value"),
+ ARRAY_CLASS_NAME = p("type-array"),
+ ARRAY_EMPTY_CLASS_NAME = p("type-array") + " " + p("empty"),
+
+ HYPERLINK_CLASS_NAME = p('a'),
+
+ UNKNOWN_CLASS_NAME = p("type-unk");
+
+ function getType(obj) {
+ var type = typeof obj;
+
+ switch (type) {
+ case "boolean":
+ return BOOL;
+ case "string":
+ return STRING;
+ case "number":
+ return (obj % 1 === 0) ? INT : FLOAT;
+ case "function":
+ return FUNCTION;
+ default:
+ if (isArray(obj)) {
+ return ARRAY;
+ } else if (obj === Object(obj)) {
+ return OBJECT;
+ } else {
+ return UNK;
+ }
+ }
+ }
+
+ function _format(data, options, parentKey) {
+
+ var result, container, key, keyNode, valNode, len, childs, tr, value,
+ isEmpty = true,
+ accum = [],
+ type = getType(data);
+
+ // Initialized & used only in case of objects & arrays
+ var hyperlinksEnabled, aTarget, hyperlinkKeys ;
+
+ switch (type) {
+ case BOOL:
+ var boolOpt = options.bool;
+ container = document.createElement('div');
+
+ if(boolOpt.showImage) {
+ var img = document.createElement('img');
+ img.setAttribute('class', BOOL_IMAGE);
+
+ img.setAttribute('src',
+ '' + (data ? boolOpt.img.true : boolOpt.img.false));
+
+ container.appendChild(img);
+ }
+
+ if(boolOpt.showText){
+ container.appendChild(data ?
+ sn("span", BOOL_TRUE_CLASS_NAME, boolOpt.text.true) :
+ sn("span", BOOL_FALSE_CLASS_NAME, boolOpt.text.false));
+ }
+
+ result = container;
+ break;
+
+ case STRING:
+ if (data === "") {
+ result = sn("span", STRING_EMPTY_CLASS_NAME, "(Empty Text)");
+ } else {
+ result = sn("span", STRING_CLASS_NAME, data);
+ }
+ break;
+ case INT:
+ result = sn("span", INT_CLASS_NAME, data);
+ break;
+ case FLOAT:
+ result = sn("span", FLOAT_CLASS_NAME, data);
+ break;
+ case OBJECT:
+ childs = [];
+
+ aTarget = options.hyperlinks.target;
+ hyperlinkKeys = options.hyperlinks.keys;
+
+ // Is Hyperlink Key
+ hyperlinksEnabled =
+ options.hyperlinks.enable &&
+ hyperlinkKeys &&
+ hyperlinkKeys.length > 0;
+
+ for (key in data) {
+ isEmpty = false;
+
+ value = data[key];
+
+ valNode = _format(value, options, key);
+ keyNode = sn("th", OBJ_KEY_CLASS_NAME, key);
+
+ if( hyperlinksEnabled &&
+ typeof(value) === 'string' &&
+ indexOf.call(hyperlinkKeys, key) >= 0){
+
+ valNode = scn("td", OBJ_VAL_CLASS_NAME, linkNode(valNode, value, aTarget));
+ } else {
+ valNode = scn("td", OBJ_VAL_CLASS_NAME, valNode);
+ }
+
+ tr = document.createElement("tr");
+ tr.appendChild(keyNode);
+ tr.appendChild(valNode);
+
+ childs.push(tr);
+ }
+
+ if (isEmpty) {
+ result = sn("span", OBJ_EMPTY_CLASS_NAME, "(Empty Object)");
+ } else {
+ result = scn("table", OBJECT_CLASS_NAME, scn("tbody", '', childs));
+ }
+ break;
+ case FUNCTION:
+ result = sn("span", FUNCTION_CLASS_NAME, data);
+ break;
+ case ARRAY:
+ if (data.length > 0) {
+ childs = [];
+ var showArrayIndices = options.showArrayIndex;
+
+ aTarget = options.hyperlinks.target;
+ hyperlinkKeys = options.hyperlinks.keys;
+
+ // Hyperlink of arrays?
+ hyperlinksEnabled = parentKey && options.hyperlinks.enable &&
+ hyperlinkKeys &&
+ hyperlinkKeys.length > 0 &&
+ indexOf.call(hyperlinkKeys, parentKey) >= 0;
+
+ for (key = 0, len = data.length; key < len; key += 1) {
+
+ keyNode = sn("th", ARRAY_KEY_CLASS_NAME, key);
+ value = data[key];
+
+ if(hyperlinksEnabled && typeof(value) === "string") {
+ valNode = _format(value, options, key);
+ valNode = scn("td", ARRAY_VAL_CLASS_NAME, linkNode(valNode, value, aTarget));
+ } else {
+ valNode = scn("td", ARRAY_VAL_CLASS_NAME, _format(value, options, key));
+ }
+
+ tr = document.createElement("tr");
+
+ if(showArrayIndices) {
+ tr.appendChild(keyNode);
+ }
+ tr.appendChild(valNode);
+
+ childs.push(tr);
+ }
+
+ result = scn("table", ARRAY_CLASS_NAME, scn("tbody", '', childs));
+ } else {
+ result = sn("span", ARRAY_EMPTY_CLASS_NAME, "(Empty List)");
+ }
+ break;
+ default:
+ result = sn("span", UNKNOWN_CLASS_NAME, data);
+ break;
+ }
+
+ return result;
+ }
+
+ function format(data, options) {
+ options = validateOptions(options || {});
+
+ var result;
+
+ result = _format(data, options);
+ result.className = result.className + " " + prefixer("root");
+
+ return result;
+ }
+
+ function validateOptions(options){
+ options = validateArrayIndexOption(options);
+ options = validateHyperlinkOptions(options);
+ options = validateBoolOptions(options);
+
+ // Add any more option validators here
+
+ return options;
+ }
+
+
+ function validateArrayIndexOption(options) {
+ if(options.showArrayIndex === undefined){
+ options.showArrayIndex = true;
+ } else {
+ // Force to boolean just in case
+ options.showArrayIndex = options.showArrayIndex ? true: false;
+ }
+
+ return options;
+ }
+
+ function validateHyperlinkOptions(options){
+ var hyperlinks = {
+ enable : false,
+ keys : null,
+ target : ''
+ };
+
+ if(options.hyperlinks && options.hyperlinks.enable) {
+ hyperlinks.enable = true;
+
+ hyperlinks.keys = isArray(options.hyperlinks.keys) ? options.hyperlinks.keys : [];
+
+ if(options.hyperlinks.target) {
+ hyperlinks.target = '' + options.hyperlinks.target;
+ } else {
+ hyperlinks.target = '_blank';
+ }
+ }
+
+ options.hyperlinks = hyperlinks;
+
+ return options;
+ }
+
+ function validateBoolOptions(options){
+ if(!options.bool){
+ options.bool = {
+ text: {
+ true : "true",
+ false : "false"
+ },
+ img : {
+ true: "",
+ false: ""
+ },
+ showImage : false,
+ showText : true
+ };
+ } else {
+ var boolOptions = options.bool;
+
+ // Show text if no option
+ if(!boolOptions.showText && !boolOptions.showImage){
+ boolOptions.showImage = false;
+ boolOptions.showText = true;
+ }
+
+ if(boolOptions.showText){
+ if(!boolOptions.text){
+ boolOptions.text = {
+ true : "true",
+ false : "false"
+ };
+ } else {
+ var t = boolOptions.text.true, f = boolOptions.text.false;
+
+ if(getType(t) != STRING || t === ''){
+ boolOptions.text.true = 'true';
+ }
+
+ if(getType(f) != STRING || f === ''){
+ boolOptions.text.false = 'false';
+ }
+ }
+ }
+
+ if(boolOptions.showImage){
+ if(!boolOptions.img.true && !boolOptions.img.false){
+ boolOptions.showImage = false;
+ }
+ }
+ }
+
+ return options;
+ }
+
+ return {
+ format: format
+ };
+}));
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/stylesheet/json.human.css
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/stylesheet/json.human.css b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/stylesheet/json.human.css
new file mode 100644
index 0000000..0c4f3cb
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/stylesheet/json.human.css
@@ -0,0 +1,146 @@
+// MIT License:
+//
+// Copyright (c) 2015, Mariano Guerra
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+.jh-root, .jh-type-object, .jh-type-array, .jh-key, .jh-value, .jh-root tr{
+ -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+ -moz-box-sizing: border-box; /* Firefox, other Gecko */
+ box-sizing: border-box; /* Opera/IE 8+ */
+ font-weight: bold;
+}
+
+.jh-key, .jh-value{
+ margin: 0;
+ padding: 0.2em;
+ font-weight: bold;
+}
+
+.jh-value{
+ border-left: 1px solid #ddd;
+}
+
+.jh-type-number{
+ text-align: center;
+ color: #5286BC;
+}
+
+.jh-type-bool-true{
+ text-align: center;
+ color: #5A811C;
+}
+
+.jh-type-bool-false{
+ text-align: center;
+ color: #D45317;
+}
+
+.jh-type-bool-image {
+ width: 20px;
+ height: 20px;
+ margin-right: 5px;
+ vertical-align: bottom;
+}
+
+.jh-type-string{
+ font-style: italic;
+ color: #6E6E6E;
+}
+
+.jh-array-key{
+ font-style: italic;
+ font-size: small;
+ text-align: center;
+}
+
+.jh-object-key, .jh-array-key{
+ color: #444;
+ vertical-align: top;
+}
+
+.jh-type-object > tr:nth-child(odd), .jh-type-array > tr:nth-child(odd){
+ background-color: #f5f5f5;
+}
+
+.jh-type-object > tr:nth-child(even), .jh-type-array > tr:nth-child(even){
+ background-color: #fff;
+}
+
+.jh-type-object, .jh-type-array{
+ width: 100%;
+ border-collapse: collapse;
+}
+
+.jh-root{
+ border: 1px solid #ccc;
+ margin: 0.2em;
+}
+
+th.jh-key{
+ text-align: left;
+}
+
+.jh-type-object > tr, .jh-type-array > tr{
+ border: 1px solid #ddd;
+ border-bottom: none;
+}
+
+.jh-type-object > tr:last-child, .jh-type-array > tr:last-child{
+ border-bottom: 1px solid #ddd;
+}
+
+.jh-type-object > tr:hover, .jh-type-array > tr:hover{
+ border: 1px solid #F99927;
+}
+
+.jh-empty{
+ font-style: italic;
+ color: #999;
+ font-size: small;
+}
+
+.jh-a {
+ text-decoration: none;
+}
+
+.jh-a:hover{
+ text-decoration: underline;
+}
+
+.jh-a span.jh-type-string {
+ text-decoration: none;
+ color : #268ddd;
+ font-style: normal;
+}
+
+html, body{
+ margin: 0;
+ padding: 0;
+}
+
+body{
+ font-family: sans;
+ color: #222;
+ background-color: #fdfdfd;
+ width: 80%;
+ margin: 10%;
+ margin-top: 2em;
+}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/72f81a6f/hyracks-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 59c30c1..abf710e 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -148,43 +148,38 @@
</licenseFamilies>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
+ <exclude>**/*.conf</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.job</exclude>
+ <exclude>**/*.prefs</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/actual/conf.xml</exclude>
+ <exclude>**/actual/customer_result/part-*</exclude>
<exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
- <exclude>**/javascript/flot/*.js</exclude>
- <exclude>**/javascript/jsplumb/*.js</exclude>
- <exclude>**/javascript/jquery/*.js</exclude>
- <exclude>**/javascript/adminconsole/*.js</exclude>
- <exclude>**/stylesheet/jquery-ui/**</exclude>
- <exclude>**/hyracks-dist/src/main/resources/conf/**</exclude>
- <exclude>**/src/test/resources/data/**</exclude>
- <exclude>**/src/test/resources/results/**</exclude>
- <exclude>**/src/test/resources/expected/**</exclude>
- <exclude>**/testcases/*.piglet</exclude>
- <exclude>**/data/**/*.tbl</exclude>
+ <exclude>**/ClusterControllerService/**</exclude>
<exclude>**/data/**/*.ddl</exclude>
+ <exclude>**/data/**/*.tbl</exclude>
<exclude>**/data/**/*.tsv</exclude>
- <exclude>**/actual/conf.xml</exclude>
- <exclude>**/actual/customer_result/part-*</exclude>
- <exclude>**/src/main/resources/conf/*</exclude>
+ <exclude>**/data/**/*.txt</exclude>
+ <exclude>**/data/*.txt</exclude>
<exclude>**/data/dfs/**</exclude>
+ <exclude>**/hyracks-dist/src/main/resources/conf/**</exclude>
<exclude>**/invIndex*/**</exclude>
- <exclude>**/*.job</exclude>
- <exclude>**/*.conf</exclude>
- <exclude>**/src/main/resources/*.cleaned</exclude>
- <exclude>**/ClusterControllerService/**</exclude>
- <exclude>**/target/**</exclude>
+ <exclude>**/javascript/adminconsole/*.js</exclude>
+ <exclude>**/javascript/flot/*.js</exclude>
+ <exclude>**/javascript/jquery/*.js</exclude>
+ <exclude>**/javascript/jsplumb/*.js</exclude>
<exclude>**/output/**</exclude>
+ <exclude>**/src/main/resources/*.cleaned</exclude>
+ <exclude>**/src/main/resources/conf/*</exclude>
+ <exclude>**/src/test/resources/data/**</exclude>
+ <exclude>**/src/test/resources/expected/**</exclude>
+ <exclude>**/src/test/resources/results/**</exclude>
+ <exclude>**/stylesheet/jquery-ui/**</exclude>
<exclude>**/target/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.prefs</exclude>
- <exclude>**/data/*.txt</exclude>
- <exclude>**/data/**/*.txt</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
+ <exclude>**/testcases/*.piglet</exclude>
<exclude>algebricks/algebricks-examples/piglet-example/testcases/*.piglet</exclude>
<exclude>algebricks/algebricks-tests/ClusterControllerService/logs/jobs/*.log</exclude>
<exclude>algebricks/algebricks-tests/data/simple/*.tbl</exclude>
@@ -195,6 +190,7 @@
<exclude>hyracks/hyracks-client/ClusterControllerService/logs/jobs/*.log</exclude>
<exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/flot/*.js</exclude>
<exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/javascript/jsplumb/jquery.jsPlumb-1.3.5-all-min.js</exclude>
+ <exclude>hyracks/hyracks-control/hyracks-control-cc/src/main/resources/static/stylesheet/json.human.css</exclude>
<exclude>hyracks/hyracks-dist/src/main/resources/conf/master</exclude>
<exclude>hyracks/hyracks-dist/src/main/resources/conf/slaves</exclude>
<exclude>hyracks/hyracks-examples/hyracks-integration-tests/data/*.txt</exclude>