Repository: incubator-flink Updated Branches: refs/heads/master 6e9b2848d -> 88e64fc78
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html b/flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html new file mode 100644 index 0000000..91a1e19 --- /dev/null +++ b/flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html @@ -0,0 +1,121 @@ +<!DOCTYPE html> +<!-- +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. +--> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content=""> + + <title>Dashboard - Apache Flink</title> + + <!-- Bootstrap core CSS --> + <link href="css/bootstrap.css" rel="stylesheet"> + + <!-- Add custom CSS here --> + <link href="css/sb-admin.css" rel="stylesheet"> + <link rel="stylesheet" href="font-awesome/css/font-awesome.min.css"> + + <!-- Page Specific CSS --> + <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" /> + + <!-- Scripts from Bootstrap --> + <script src="js/jquery-2.1.0.js"></script> + <script src="js/bootstrap.js"></script> + + <!-- Scripts from Flink --> + <script type="text/javascript" src="js/jquery.flot.min.js"></script> + <script type="text/javascript" src="js/helpers.js"></script> + <script type="text/javascript" src="js/taskmanager.js"></script> + <script type="text/javascript" src="js/jcanvas.min.js"></script> + + <!-- Load Menu --> + <script type="text/javascript"> + $(document).ready(function() { + $.ajax({ url : "menu?get=taskmanagers", type : "GET", cache: false, success : function(html) { + $("#side-menu").empty(); + $("#side-menu").append(html); + }, dataType : "html", + }); + }); + </script> + </head> + + <body> + + <div id="wrapper"> + + <!-- Sidebar --> + <nav class='navbar navbar-inverse navbar-fixed-top' role='navigation'> + <!-- Brand and toggle get grouped for better mobile display --> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <table> + <tr> + <td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td> + <td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td> + </tr> + </table> + </div> + + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse navbar-ex1-collapse"> + <ul id="side-menu" class="nav navbar-nav side-nav"> + <!-- Filled via script --> + </ul> + <ul class="nav navbar-nav navbar-right navbar-user"> + <li class="dropdown user-dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li> + <li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li> + </ul> + </li> + </ul> + </div><!-- /.navbar-collapse --> + </nav> + + <div id="page-wrapper"> + + <div class="row"> + <div class="col-lg-12"> + <h1>Task Managers <small>Overview over connected Task Managers</small></h1> + <ol class="breadcrumb"> + <li><a href="index.html"><i class="icon-dashboard"></i> Dashboard</a></li> + <li class="active"><i class="icon-file-alt"></i> Task Managers</li> + </ol> + </div> + <div class="col-lg-12"> + <div class="table-responsive" id="taskmanagerTable"> + </div> + </div> + </div><!-- /.row --> + + </div><!-- /#page-wrapper --> + + </div><!-- /#wrapper --> + + </body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded/pom.xml b/flink-shaded/pom.xml index 0b0c75c..a124edc 100644 --- a/flink-shaded/pom.xml +++ b/flink-shaded/pom.xml @@ -56,24 +56,24 @@ under the License. <goals> <goal>shade</goal> </goals> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <createDependencyReducedPom>true</createDependencyReducedPom> + <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation> + <artifactSet> + <includes> + <include>com.google.guava:guava</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>com.google</pattern> + <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern> + </relocation> + </relocations> + </configuration> </execution> </executions> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <createDependencyReducedPom>true</createDependencyReducedPom> - <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation> - <artifactSet> - <includes> - <include>com.google.guava:guava</include> - </includes> - </artifactSet> - <relocations> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern> - </relocation> - </relocations> - </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b4b593d..58bf3db 100644 --- a/pom.xml +++ b/pom.xml @@ -561,23 +561,23 @@ under the License. <goals> <goal>shade</goal> </goals> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <createDependencyReducedPom>false</createDependencyReducedPom> + <artifactSet> + <includes> + <include>org.apache.flink:${project.artifact}</include> + </includes> + </artifactSet> + <relocations> + <relocation> + <pattern>com.google</pattern> + <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern> + </relocation> + </relocations> + </configuration> </execution> </executions> - <configuration> - <shadedArtifactAttached>false</shadedArtifactAttached> - <createDependencyReducedPom>false</createDependencyReducedPom> - <artifactSet> - <includes> - <include>org.apache.flink:${project.artifact}</include> - </includes> - </artifactSet> - <relocations> - <relocation> - <pattern>com.google</pattern> - <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern> - </relocation> - </relocations> - </configuration> </plugin> <plugin> <groupId>org.apache.rat</groupId>
