You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ka...@apache.org on 2016/07/05 01:08:02 UTC
incubator-gearpump git commit: fix GEARPUMP-173 Create 0.8.1-RC1
release
Repository: incubator-gearpump
Updated Branches:
refs/heads/master acc1ee5a4 -> ec667d45d
fix GEARPUMP-173 Create 0.8.1-RC1 release
Author: Kam Kasravi <ka...@yahoo.com>
Closes #57 from kkasravi/GEARPUMP-173.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/ec667d45
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/ec667d45
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/ec667d45
Branch: refs/heads/master
Commit: ec667d45dba50579020b67a2a39a68d5e2e23a30
Parents: acc1ee5
Author: Kam Kasravi <ka...@yahoo.com>
Authored: Mon Jul 4 18:08:36 2016 -0700
Committer: Kam Kasravi <ka...@yahoo.com>
Committed: Mon Jul 4 18:08:36 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 5 +-
.../apache/gearpump/cluster/ClusterConfig.scala | 6 +-
docs/_config.yml | 2 +-
project/BuildExample.scala | 63 ++++++++++---------
services/dashboard/index.html | 5 +-
services/dashboard/login/login.html | 3 +-
services/dashboard/logo.png | Bin 0 -> 2053 bytes
.../dashboard/views/apps/app/alerts_table.html | 7 +--
services/dashboard/views/apps/app/app.html | 3 +-
.../views/apps/app/executors_table.html | 9 ++-
services/dashboard/views/apps/app/overview.html | 3 +-
services/dashboard/views/apps/apps.html | 3 +-
.../dashboard/views/apps/compose/compose.html | 4 +-
.../views/apps/compose/popups/choose_edge.html | 3 +-
.../apps/compose/popups/choose_processor.html | 3 +-
.../views/apps/compose/popups/contextmenu.html | 3 +-
.../dashboard/views/apps/streamingapp/dag.html | 3 +-
.../views/apps/streamingapp/executor.html | 3 +-
.../apps/streamingapp/metric_selector.html | 9 ++-
.../views/apps/streamingapp/metrics_charts.html | 3 +-
.../views/apps/streamingapp/metrics_table.html | 3 +-
.../views/apps/streamingapp/overview.html | 3 +-
.../apps/streamingapp/popups/dag_edit.html | 3 +-
.../views/apps/streamingapp/processor.html | 3 +-
.../streamingapp/processor_task_charts.html | 4 +-
.../apps/streamingapp/processor_task_pager.html | 3 +-
.../apps/streamingapp/processor_task_table.html | 3 +-
.../views/apps/streamingapp/streamingapp.html | 3 +-
.../dashboard/views/apps/submit/submit.html | 3 +-
.../dashboard/views/cluster/master/master.html | 3 +-
services/dashboard/views/cluster/overview.html | 4 +-
.../views/cluster/workers/add_worker.html | 20 +++++-
.../views/cluster/workers/worker/worker.html | 40 +++++++++++-
.../views/cluster/workers/workers_listview.html | 20 +++++-
.../dashboard/views/landing/breadcrumbs.html | 3 +-
services/dashboard/views/landing/header.html | 3 +-
.../views/service_unreachable_notice.html | 3 +-
.../widgets/metrics_period_switcher.html | 8 +--
services/dashboard/widgets/radio_group.html | 3 +-
version.sbt | 2 +-
40 files changed, 164 insertions(+), 113 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71e7b12..3ef4b45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,13 @@ Apache Gearpump 0.8.1
==================
Change log:
------------------
-- GEARPUMP-169, upgrade sbt-assembly and shade
+- GEARPUMP-173 Create 0.8.1-RC1 release
+- GEARPUMP-170 Create 0.8.1 release
+- GEARPUMP-169 upgrade sbt-assembly and shade
- GEARPUMP-166 Rename sumByValue to sumByKey
- GEARPUMP-165 RestServiceSpec failed
- GEARPUMP-164 Let the user that connects to HBase (HBaseSink) be configurable
+- GEARPUMP-161 application logs are located in wrong place on Yarn
- GEARPUMP-160 add KafkaDSL examples and fix docs
- GEARPUMP-159 Prep for first release
- GEARPUMP-156 Replace logo in site, GitHub, Travis, etc
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/core/src/main/scala/org/apache/gearpump/cluster/ClusterConfig.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/cluster/ClusterConfig.scala b/core/src/main/scala/org/apache/gearpump/cluster/ClusterConfig.scala
index e0751f9..fe8b761 100644
--- a/core/src/main/scala/org/apache/gearpump/cluster/ClusterConfig.scala
+++ b/core/src/main/scala/org/apache/gearpump/cluster/ClusterConfig.scala
@@ -90,7 +90,9 @@ object ClusterConfig {
LOG.info("loading config file " + path + "..........")
load(ClusterConfigSource(path))
case None =>
- LOG.info(s"loading config file $configFile...")
+ if (configFile != null) {
+ LOG.info(s"loading config file $configFile...")
+ }
load(ClusterConfigSource(configFile))
}
}
@@ -177,4 +179,4 @@ object ClusterConfig {
protected class Configs(
val master: Config, val worker: Config, val ui: Config, val default: Config)
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 84ce664..ab1b90a 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -16,6 +16,6 @@ exclude:
- build_doc.sh
# These allow the documentation to be updated with newer releases of Gearpump
-GEARPUMP_VERSION: 0.8.1-RC0
+GEARPUMP_VERSION: 0.8.1-RC1
SCALA_BINARY_VERSION: "2.11"
SCALA_VERSION: "2.11.8"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/project/BuildExample.scala
----------------------------------------------------------------------
diff --git a/project/BuildExample.scala b/project/BuildExample.scala
index 060d18a..75fc9be 100644
--- a/project/BuildExample.scala
+++ b/project/BuildExample.scala
@@ -63,6 +63,7 @@ object BuildExample extends sbt.Build {
settings = commonSettings ++ noPublish ++ myAssemblySettings ++
Seq(
mainClass in(Compile, packageBin) := Some("org.apache.gearpump.streaming.examples.sol.SOL"),
+
target in assembly := baseDirectory.value.getParentFile.getParentFile / "target" /
CrossVersion.binaryScalaVersion(scalaVersion.value)
@@ -85,7 +86,7 @@ object BuildExample extends sbt.Build {
lazy val transport = Project(
id = "gearpump-examples-transport",
base = file("examples/streaming/transport"),
- settings = commonSettings ++ noPublish ++
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
Seq(
libraryDependencies ++= Seq(
"io.spray" %% "spray-can" % sprayVersion,
@@ -117,7 +118,7 @@ object BuildExample extends sbt.Build {
lazy val distributeservice = Project(
id = "gearpump-examples-distributeservice",
base = file("examples/distributeservice"),
- settings = commonSettings ++ noPublish ++
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
Seq(
libraryDependencies ++= Seq(
"commons-httpclient" % "commons-httpclient" % commonsHttpVersion,
@@ -137,7 +138,7 @@ object BuildExample extends sbt.Build {
lazy val fsio = Project(
id = "gearpump-examples-fsio",
base = file("examples/streaming/fsio"),
- settings = commonSettings ++ noPublish ++
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
Seq(
libraryDependencies ++= Seq(
"org.apache.hadoop" % "hadoop-common" % hadoopVersion
@@ -174,7 +175,7 @@ object BuildExample extends sbt.Build {
lazy val stockcrawler = Project(
id = "gearpump-examples-stockcrawler",
base = file("examples/streaming/stockcrawler"),
- settings = commonSettings ++ noPublish ++
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
Seq(
libraryDependencies ++= Seq(
"io.spray" %% "spray-can" % sprayVersion,
@@ -197,37 +198,39 @@ object BuildExample extends sbt.Build {
lazy val examples_state = Project(
id = "gearpump-examples-state",
base = file("examples/streaming/state"),
- settings = commonSettings ++ noPublish ++ myAssemblySettings ++ Seq(
- libraryDependencies ++= Seq(
- "org.apache.hadoop" % "hadoop-common" % hadoopVersion
- exclude("org.mortbay.jetty", "jetty-util")
- exclude("org.mortbay.jetty", "jetty")
- exclude("org.fusesource.leveldbjni", "leveldbjni-all")
- exclude("tomcat", "jasper-runtime")
- exclude("commons-beanutils", "commons-beanutils-core")
- exclude("commons-beanutils", "commons-beanutils")
- exclude("asm", "asm")
- exclude("org.ow2.asm", "asm"),
- "org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion
- ),
- mainClass in(Compile, packageBin) :=
- Some("org.apache.gearpump.streaming.examples.state.MessageCountApp"),
-
- target in assembly := baseDirectory.value.getParentFile.getParentFile / "target" /
- CrossVersion.binaryScalaVersion(scalaVersion.value)
- )
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
+ Seq(
+ libraryDependencies ++= Seq(
+ "org.apache.hadoop" % "hadoop-common" % hadoopVersion
+ exclude("org.mortbay.jetty", "jetty-util")
+ exclude("org.mortbay.jetty", "jetty")
+ exclude("org.fusesource.leveldbjni", "leveldbjni-all")
+ exclude("tomcat", "jasper-runtime")
+ exclude("commons-beanutils", "commons-beanutils-core")
+ exclude("commons-beanutils", "commons-beanutils")
+ exclude("asm", "asm")
+ exclude("org.ow2.asm", "asm"),
+ "org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion
+ ),
+ mainClass in(Compile, packageBin) :=
+ Some("org.apache.gearpump.streaming.examples.state.MessageCountApp"),
+
+ target in assembly := baseDirectory.value.getParentFile.getParentFile / "target" /
+ CrossVersion.binaryScalaVersion(scalaVersion.value)
+ )
).dependsOn(streaming % "test->test; provided",
external_hadoopfs, external_monoid, external_serializer, external_kafka)
lazy val pagerank = Project(
id = "gearpump-examples-pagerank",
base = file("examples/pagerank"),
- settings = commonSettings ++ noPublish ++ myAssemblySettings ++ Seq(
- mainClass in(Compile, packageBin) :=
- Some("org.apache.gearpump.experiments.pagerank.example.PageRankExample"),
+ settings = commonSettings ++ noPublish ++ myAssemblySettings ++
+ Seq(
+ mainClass in(Compile, packageBin) :=
+ Some("org.apache.gearpump.experiments.pagerank.example.PageRankExample"),
- target in assembly := baseDirectory.value.getParentFile.getParentFile / "target" /
- CrossVersion.binaryScalaVersion(scalaVersion.value)
- )
+ target in assembly := baseDirectory.value.getParentFile.getParentFile / "target" /
+ CrossVersion.binaryScalaVersion(scalaVersion.value)
+ )
) dependsOn (streaming % "test->test; provided")
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/index.html
----------------------------------------------------------------------
diff --git a/services/dashboard/index.html b/services/dashboard/index.html
index a7fc6c1..52a7b90 100644
--- a/services/dashboard/index.html
+++ b/services/dashboard/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,6 @@ specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE html>
<html lang="en">
<head>
<!-- Standard Meta -->
@@ -27,7 +27,8 @@ under the License.
content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/>
<!-- Site Properties -->
- <title>Dashboard</title>
+ <title>Gearpump</title>
+ <link rel="icon" type="image/png" href="logo.png">
<!-- Static Resources -->
<link rel="stylesheet" href="webjars/bootstrap/3.3.6/css/bootstrap.min.css"/>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/login/login.html
----------------------------------------------------------------------
diff --git a/services/dashboard/login/login.html b/services/dashboard/login/login.html
index bda4f04..79e5ee5 100644
--- a/services/dashboard/login/login.html
+++ b/services/dashboard/login/login.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<!DOCTYPE html>
<html>
<head>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/logo.png
----------------------------------------------------------------------
diff --git a/services/dashboard/logo.png b/services/dashboard/logo.png
new file mode 100644
index 0000000..7575892
Binary files /dev/null and b/services/dashboard/logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/app/alerts_table.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/app/alerts_table.html b/services/dashboard/views/apps/app/alerts_table.html
index da7e80b..6130c0b 100644
--- a/services/dashboard/views/apps/app/alerts_table.html
+++ b/services/dashboard/views/apps/app/alerts_table.html
@@ -1,3 +1,6 @@
+<sortable-table
+ caption="Alerts"
+ columns-bind="table.cols" records-bind="table.rows" pagination="4">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,10 +19,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<sortable-table
- caption="Alerts"
- columns-bind="table.cols" records-bind="table.rows" pagination="4">
<div class="table-no-data-sm">
<h5><span class="glyphicon glyphicon-bullhorn"></span>
No alert reported so far</h5>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/app/app.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/app/app.html b/services/dashboard/views/apps/app/app.html
index 5d343bd..5ab51bf 100644
--- a/services/dashboard/views/apps/app/app.html
+++ b/services/dashboard/views/apps/app/app.html
@@ -1,3 +1,4 @@
+<div class="col-md-12">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-12">
<h4>
<!-- todo: backend api should enforce user application has a readable name! -->
<span ng-bind="app.appName"></span>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/app/executors_table.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/app/executors_table.html b/services/dashboard/views/apps/app/executors_table.html
index 11e373b..afc2044 100644
--- a/services/dashboard/views/apps/app/executors_table.html
+++ b/services/dashboard/views/apps/app/executors_table.html
@@ -1,3 +1,7 @@
+<sortable-table
+ caption="Executors"
+ caption-tooltip="{{whatIsExecutor}}"
+ columns-bind="table.cols" records-bind="table.rows" pagination="4">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,9 +20,4 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<sortable-table
- caption="Executors"
- caption-tooltip="{{whatIsExecutor}}"
- columns-bind="table.cols" records-bind="table.rows" pagination="4">
</sortable-table>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/app/overview.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/app/overview.html b/services/dashboard/views/apps/app/overview.html
index 6e1a7ff..211c7dc 100644
--- a/services/dashboard/views/apps/app/overview.html
+++ b/services/dashboard/views/apps/app/overview.html
@@ -1,3 +1,4 @@
+<div class="col-md-6">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-6">
<property-table
caption="Summary"
props-bind="appSummary"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/apps.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/apps.html b/services/dashboard/views/apps/apps.html
index 1baecf5..fa2d481 100644
--- a/services/dashboard/views/apps/apps.html
+++ b/services/dashboard/views/apps/apps.html
@@ -1,3 +1,4 @@
+<div class="col-md-12">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-12">
<!-- control toolbar -->
<div class="row">
<div class="col-md-6 col-sm-6">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/compose/compose.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/compose.html b/services/dashboard/views/apps/compose/compose.html
index d640e32..e587ac8 100644
--- a/services/dashboard/views/apps/compose/compose.html
+++ b/services/dashboard/views/apps/compose/compose.html
@@ -1,3 +1,4 @@
+<div class="col-md-3">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,9 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-3">
-
<h5>Application Name</h5>
<form name="form">
<input class="form-control" type="text" ng-model="appName" />
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/compose/popups/choose_edge.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/popups/choose_edge.html b/services/dashboard/views/apps/compose/popups/choose_edge.html
index 323a0b1..29fea36 100644
--- a/services/dashboard/views/apps/compose/popups/choose_edge.html
+++ b/services/dashboard/views/apps/compose/popups/choose_edge.html
@@ -1,3 +1,4 @@
+<div class="modal" tabindex="-1">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="modal" tabindex="-1">
<div class="modal-md col-md-5 col-md-offset-3">
<div class="modal-content">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/compose/popups/choose_processor.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/popups/choose_processor.html b/services/dashboard/views/apps/compose/popups/choose_processor.html
index bff8fec..31486ec 100644
--- a/services/dashboard/views/apps/compose/popups/choose_processor.html
+++ b/services/dashboard/views/apps/compose/popups/choose_processor.html
@@ -1,3 +1,4 @@
+<div class="modal" tabindex="-1">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="modal" tabindex="-1">
<div class="modal-md col-md-5 col-md-offset-3">
<div class="modal-content">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/compose/popups/contextmenu.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/compose/popups/contextmenu.html b/services/dashboard/views/apps/compose/popups/contextmenu.html
index 802b46c..ffa2aee 100644
--- a/services/dashboard/views/apps/compose/popups/contextmenu.html
+++ b/services/dashboard/views/apps/compose/popups/contextmenu.html
@@ -1,3 +1,4 @@
+<ul class="dropdown-menu dropdown-menu-sm">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<ul class="dropdown-menu dropdown-menu-sm">
<li><a href="" ng-click="selectItemDelete()">
<span class="glyphicon glyphicon-trash"></span>
Delete</a>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/dag.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/dag.html b/services/dashboard/views/apps/streamingapp/dag.html
index a8aa549..caa152e 100644
--- a/services/dashboard/views/apps/streamingapp/dag.html
+++ b/services/dashboard/views/apps/streamingapp/dag.html
@@ -1,3 +1,4 @@
+<div class="col-md-8">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-8">
<div class="panel panel-sm panel-default">
<div class="panel-heading">DAG
<remark class="pull-right" type="info"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/executor.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/executor.html b/services/dashboard/views/apps/streamingapp/executor.html
index d26ac49..359bf2f 100644
--- a/services/dashboard/views/apps/streamingapp/executor.html
+++ b/services/dashboard/views/apps/streamingapp/executor.html
@@ -1,3 +1,4 @@
+<div class="col-md-6">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-6">
<property-table
caption="{{executorName}}"
caption-tooltip="In runtime, every application instance is represented by a single AppMaster and a list of Executors. AppMaster represents the command and controls center of the Application instance. It communicates with user, master, worker, and executor to get the job done. Each executor is a parallel unit for distributed application. Typically AppMaster and Executor will be started as JVM processes on worker nodes."
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/metric_selector.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/metric_selector.html b/services/dashboard/views/apps/streamingapp/metric_selector.html
index a98e3a0..4860c86 100644
--- a/services/dashboard/views/apps/streamingapp/metric_selector.html
+++ b/services/dashboard/views/apps/streamingapp/metric_selector.html
@@ -1,3 +1,7 @@
+<ui-select
+ theme="select2" class="form-control"
+ style="width: 100%; margin-bottom: 20px; cursor: pointer"
+ ng-model="names.selected" search-enabled="false">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,11 +20,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<ui-select
- theme="select2" class="form-control"
- style="width: 100%; margin-bottom: 20px; cursor: pointer"
- ng-model="names.selected" search-enabled="false">
<ui-select-match>{{$select.selected}}</ui-select-match>
<ui-select-choices repeat="name in names.available">
<div ng-class="{bold: $select.selected === name}"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/metrics_charts.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/metrics_charts.html b/services/dashboard/views/apps/streamingapp/metrics_charts.html
index 186f278..71e55fd 100644
--- a/services/dashboard/views/apps/streamingapp/metrics_charts.html
+++ b/services/dashboard/views/apps/streamingapp/metrics_charts.html
@@ -1,3 +1,4 @@
+<div class="row">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="row">
<div class="col-md-12">
<metrics-period-switcher
past-hours="metricsConfig.retainHistoryDataHours"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/metrics_table.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/metrics_table.html b/services/dashboard/views/apps/streamingapp/metrics_table.html
index bcc7986..3152894 100644
--- a/services/dashboard/views/apps/streamingapp/metrics_table.html
+++ b/services/dashboard/views/apps/streamingapp/metrics_table.html
@@ -1,3 +1,4 @@
+<div class="col-md-12">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-12">
<!-- control toolbar -->
<div class="row">
<div class="col-md-6">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/overview.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/overview.html b/services/dashboard/views/apps/streamingapp/overview.html
index 023257b..cbd5d54 100644
--- a/services/dashboard/views/apps/streamingapp/overview.html
+++ b/services/dashboard/views/apps/streamingapp/overview.html
@@ -1,3 +1,4 @@
+<div class="col-md-6">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-6">
<property-table
caption="Summary"
props-bind="appSummary"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/popups/dag_edit.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/popups/dag_edit.html b/services/dashboard/views/apps/streamingapp/popups/dag_edit.html
index 729b9a3..9303da7 100644
--- a/services/dashboard/views/apps/streamingapp/popups/dag_edit.html
+++ b/services/dashboard/views/apps/streamingapp/popups/dag_edit.html
@@ -1,3 +1,4 @@
+<div class="modal" tabindex="-1">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="modal" tabindex="-1">
<div class="modal-md col-md-5 col-md-offset-3">
<div class="modal-content">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/processor.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/processor.html b/services/dashboard/views/apps/streamingapp/processor.html
index f82848b..0c59cfc 100644
--- a/services/dashboard/views/apps/streamingapp/processor.html
+++ b/services/dashboard/views/apps/streamingapp/processor.html
@@ -1,3 +1,4 @@
+<div class="col-md-12">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-12">
<div class="row">
<!-- left half -->
<div class="col-md-6">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/processor_task_charts.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/processor_task_charts.html b/services/dashboard/views/apps/streamingapp/processor_task_charts.html
index 16dbe56..1f21f0d 100644
--- a/services/dashboard/views/apps/streamingapp/processor_task_charts.html
+++ b/services/dashboard/views/apps/streamingapp/processor_task_charts.html
@@ -1,3 +1,4 @@
+<div class="row">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,9 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="row">
-
<div class="col-md-12">
<h5>Message Send Throughput (msg/s)</h5>
<line-chart
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/processor_task_pager.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/processor_task_pager.html b/services/dashboard/views/apps/streamingapp/processor_task_pager.html
index 2cd83b1..e42fc5a 100644
--- a/services/dashboard/views/apps/streamingapp/processor_task_pager.html
+++ b/services/dashboard/views/apps/streamingapp/processor_task_pager.html
@@ -1,3 +1,4 @@
+<div>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div>
<span style="display: inline-block;">
(Showing {{range.start + 1}} - {{range.stop + 1}} of {{count}} tasks)
</span>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/processor_task_table.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/processor_task_table.html b/services/dashboard/views/apps/streamingapp/processor_task_table.html
index 4f96d28..23ea4bf 100644
--- a/services/dashboard/views/apps/streamingapp/processor_task_table.html
+++ b/services/dashboard/views/apps/streamingapp/processor_task_table.html
@@ -1,3 +1,4 @@
+<div>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div>
<sortable-table
ng-if="metricType == 'meter'"
columns-bind="meterMetricsTable.cols"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/streamingapp/streamingapp.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/streamingapp.html b/services/dashboard/views/apps/streamingapp/streamingapp.html
index d5e6115..0173b35 100644
--- a/services/dashboard/views/apps/streamingapp/streamingapp.html
+++ b/services/dashboard/views/apps/streamingapp/streamingapp.html
@@ -1,3 +1,4 @@
+<div class="col-md-12">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-12">
<div class="row">
<div class="col-md-6 col-sm-4">
<h4>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/apps/submit/submit.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/submit/submit.html b/services/dashboard/views/apps/submit/submit.html
index ba34fce..a2b3cfc 100644
--- a/services/dashboard/views/apps/submit/submit.html
+++ b/services/dashboard/views/apps/submit/submit.html
@@ -1,3 +1,4 @@
+<div class="modal" tabindex="-1">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="modal" tabindex="-1">
<div class="modal-md col-md-5 col-md-offset-3">
<div class="modal-content">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/cluster/master/master.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/master/master.html b/services/dashboard/views/cluster/master/master.html
index 7517a6f..d40c84c 100644
--- a/services/dashboard/views/cluster/master/master.html
+++ b/services/dashboard/views/cluster/master/master.html
@@ -1,3 +1,4 @@
+<div class="col-md-6">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="col-md-6">
<property-table
caption="Master Overview"
caption-tooltip="{{whatIsMaster}}"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/cluster/overview.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/overview.html b/services/dashboard/views/cluster/overview.html
index 3aad796..1efb533 100644
--- a/services/dashboard/views/cluster/overview.html
+++ b/services/dashboard/views/cluster/overview.html
@@ -1,3 +1,4 @@
+<div ui-view>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,5 +17,4 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div ui-view></div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/cluster/workers/add_worker.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/workers/add_worker.html b/services/dashboard/views/cluster/workers/add_worker.html
index b340a16..c803f78 100644
--- a/services/dashboard/views/cluster/workers/add_worker.html
+++ b/services/dashboard/views/cluster/workers/add_worker.html
@@ -1,4 +1,22 @@
<div class="modal" tabindex="-1">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<div class="modal-dialog" style="max-width: 440px">
<div class="modal-content">
<div class="modal-header">
@@ -44,4 +62,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/cluster/workers/worker/worker.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/workers/worker/worker.html b/services/dashboard/views/cluster/workers/worker/worker.html
index e290874..bec4775 100644
--- a/services/dashboard/views/cluster/workers/worker/worker.html
+++ b/services/dashboard/views/cluster/workers/worker/worker.html
@@ -1,5 +1,23 @@
-<!-- todo: create a header directive -->
<div class="col-md-12">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<!-- todo: create a header directive -->
<div class="row">
<div class="col-md-6 col-sm-4">
<h4>
@@ -30,6 +48,24 @@
</div>
<div class="col-md-6">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<property-table
caption="Overview"
caption-tooltip="{{whatIsWorker}}"
@@ -56,4 +92,4 @@
sampling-config="metricsConfig"
query-metrics-fn-ref="queryMetricsFnRef">
</jvm-metrics-view>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/cluster/workers/workers_listview.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/workers/workers_listview.html b/services/dashboard/views/cluster/workers/workers_listview.html
index 8b65005..a81d6d5 100644
--- a/services/dashboard/views/cluster/workers/workers_listview.html
+++ b/services/dashboard/views/cluster/workers/workers_listview.html
@@ -1,4 +1,22 @@
<div class="col-md-12">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<!-- control toolbar -->
<div class="row">
<div class="col-md-6">
@@ -35,4 +53,4 @@
<p>Please contact your administrator to launch worker for applications.</p>
</div>
</sortable-table>
-</div>
\ No newline at end of file
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/landing/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/landing/breadcrumbs.html b/services/dashboard/views/landing/breadcrumbs.html
index 2d47653..9bd04e0 100644
--- a/services/dashboard/views/landing/breadcrumbs.html
+++ b/services/dashboard/views/landing/breadcrumbs.html
@@ -1,3 +1,4 @@
+<ol class="breadcrumb breadcrumb-alt">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<ol class="breadcrumb breadcrumb-alt">
<li ng-repeat="breadcrumb in breadcrumbs track by $index">
<a ng-if="!$last" ng-href="#{{breadcrumb.path}}" ng-bind="breadcrumb.text"></a>
<span ng-if="$last" class="active" ng-bind="breadcrumb.text"></span>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/landing/header.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/landing/header.html b/services/dashboard/views/landing/header.html
index e508552..bf7b692 100644
--- a/services/dashboard/views/landing/header.html
+++ b/services/dashboard/views/landing/header.html
@@ -1,3 +1,4 @@
+<nav class="navbar navbar-inverse navbar-fixed-top">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main_nav">
<span class="sr-only">Toggle navigation</span>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/views/service_unreachable_notice.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/service_unreachable_notice.html b/services/dashboard/views/service_unreachable_notice.html
index 4c4767e..1d9a753 100644
--- a/services/dashboard/views/service_unreachable_notice.html
+++ b/services/dashboard/views/service_unreachable_notice.html
@@ -1,3 +1,4 @@
+<div class="modal" tabindex="-1">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="modal" tabindex="-1">
<div class="modal-md col-md-6 col-md-offset-3">
<div class="modal-content">
<div class="modal-header">
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/widgets/metrics_period_switcher.html
----------------------------------------------------------------------
diff --git a/services/dashboard/widgets/metrics_period_switcher.html b/services/dashboard/widgets/metrics_period_switcher.html
index f076c5e..7e8cace 100644
--- a/services/dashboard/widgets/metrics_period_switcher.html
+++ b/services/dashboard/widgets/metrics_period_switcher.html
@@ -1,3 +1,6 @@
+<radio-group
+ options="options" button-width="110px"
+ ng-model="value">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,7 +19,4 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<radio-group
- options="options" button-width="110px"
- ng-model="value"></radio-group>
+</radio-group>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/services/dashboard/widgets/radio_group.html
----------------------------------------------------------------------
diff --git a/services/dashboard/widgets/radio_group.html b/services/dashboard/widgets/radio_group.html
index 3bf09b2..59293b6 100644
--- a/services/dashboard/widgets/radio_group.html
+++ b/services/dashboard/widgets/radio_group.html
@@ -1,3 +1,4 @@
+<div class="row">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<div class="row">
<div class="col-md-12 text-center">
<div class="btn-group btn-group-xs">
<button ng-repeat="(value, text) in options track by $index"
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ec667d45/version.sbt
----------------------------------------------------------------------
diff --git a/version.sbt b/version.sbt
index f3c7cf9..ca34aa1 100644
--- a/version.sbt
+++ b/version.sbt
@@ -16,4 +16,4 @@
* limitations under the License.
*/
-version in ThisBuild := "0.8.1-RC0"
+version in ThisBuild := "0.8.1-RC1"