Moved WebInfoServer and WebInterfaceServer resources into resource folders of respective projects. Jetty uses the jar as base directory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/76d603c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/76d603c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/76d603c0 Branch: refs/heads/master Commit: 76d603c04aa09eb159d5a40c53c4d26e30562eb6 Parents: 5a192bd Author: Till Rohrmann <[email protected]> Authored: Fri Oct 10 15:50:27 2014 +0200 Committer: Till Rohrmann <[email protected]> Committed: Thu Dec 18 18:58:30 2014 +0100 ---------------------------------------------------------------------- DEPENDENCIES | 2 +- LICENSE | 2 +- .../apache/flink/yarn/ApplicationMaster.scala | 14 +- flink-addons/pom.xml | 10 +- .../resources/web-docs/css/bootstrap.css | 5785 ----------- flink-clients/resources/web-docs/css/graph.css | 48 - .../resources/web-docs/css/nephelefrontend.css | 198 - .../resources/web-docs/css/overlay.css | 47 - .../resources/web-docs/css/pactgraphs.css | 294 - .../resources/web-docs/img/delete-icon.png | Bin 1204 -> 0 bytes .../resources/web-docs/img/overlay/close.png | Bin 1996 -> 0 bytes flink-clients/resources/web-docs/index.html | 26 - .../resources/web-docs/js/bootstrap.min.js | 6 - flink-clients/resources/web-docs/js/d3.js | 9263 ------------------ flink-clients/resources/web-docs/js/dagre-d3.js | 4560 --------- .../resources/web-docs/js/graphCreator.js | 445 - .../resources/web-docs/js/jquery-2.1.0.js | 9111 ----------------- .../resources/web-docs/js/jquery.tools.min.js | 20 - flink-clients/resources/web-docs/js/program.js | 240 - flink-clients/resources/web-docs/launch.html | 110 - .../flink/client/web/WebInterfaceServer.java | 30 +- .../main/resources/web-docs/css/bootstrap.css | 5785 +++++++++++ .../src/main/resources/web-docs/css/graph.css | 48 + .../resources/web-docs/css/nephelefrontend.css | 198 + .../src/main/resources/web-docs/css/overlay.css | 47 + .../main/resources/web-docs/css/pactgraphs.css | 294 + .../main/resources/web-docs/img/FlinkLogo.png | Bin 0 -> 7547 bytes .../resources/web-docs/img/GradientBoxes.png | Bin 0 -> 26286 bytes .../main/resources/web-docs/img/arrows/arr.gif | Bin 0 -> 901 bytes .../main/resources/web-docs/img/arrows/arr2.gif | Bin 0 -> 845 bytes .../resources/web-docs/img/arrows/arr2_d.gif | Bin 0 -> 851 bytes .../resources/web-docs/img/arrows/arr2_l.gif | Bin 0 -> 846 bytes .../resources/web-docs/img/arrows/arr2_r.gif | Bin 0 -> 845 bytes .../resources/web-docs/img/arrows/arr2_u.gif | Bin 0 -> 852 bytes .../resources/web-docs/img/arrows/arr_d.gif | Bin 0 -> 911 bytes .../resources/web-docs/img/arrows/arr_l.gif | Bin 0 -> 902 bytes .../resources/web-docs/img/arrows/arr_r.gif | Bin 0 -> 901 bytes .../resources/web-docs/img/arrows/arr_u.gif | Bin 0 -> 910 bytes .../resources/web-docs/img/arrows/arrow.gif | Bin 0 -> 53 bytes .../resources/web-docs/img/arrows/arrow_d.gif | Bin 0 -> 828 bytes .../resources/web-docs/img/arrows/arrow_l.gif | Bin 0 -> 828 bytes .../resources/web-docs/img/arrows/arrow_r.gif | Bin 0 -> 53 bytes .../resources/web-docs/img/arrows/arrow_u.gif | Bin 0 -> 827 bytes .../main/resources/web-docs/img/delete-icon.png | Bin 0 -> 1204 bytes .../main/resources/web-docs/img/gradient.jpg | Bin 0 -> 28636 bytes .../resources/web-docs/img/overlay/close.png | Bin 0 -> 1996 bytes .../src/main/resources/web-docs/index.html | 26 + .../main/resources/web-docs/js/bootstrap.min.js | 6 + .../src/main/resources/web-docs/js/d3.js | 9263 ++++++++++++++++++ .../src/main/resources/web-docs/js/dagre-d3.js | 4560 +++++++++ .../main/resources/web-docs/js/graphCreator.js | 445 + .../main/resources/web-docs/js/jquery-2.1.0.js | 9111 +++++++++++++++++ .../resources/web-docs/js/jquery.tools.min.js | 20 + .../src/main/resources/web-docs/js/program.js | 240 + .../src/main/resources/web-docs/launch.html | 110 + .../flink/configuration/ConfigConstants.java | 45 - flink-dist/pom.xml | 82 +- flink-dist/src/main/assemblies/bin.xml | 20 - flink-dist/src/main/assemblies/yarn-uberjar.xml | 10 - flink-dist/src/main/flink-bin/LICENSE | 2 +- flink-dist/src/main/resources/flink-conf.yaml | 77 + .../resources/web-docs-infoserver/analyze.html | 155 - .../web-docs-infoserver/blank-page.html | 116 - .../web-docs-infoserver/configuration.html | 122 - .../web-docs-infoserver/css/bootstrap.css | 5831 ----------- .../web-docs-infoserver/css/bootstrap.min.css | 7 - .../web-docs-infoserver/css/nephelefrontend.css | 21 - .../web-docs-infoserver/css/sb-admin.css | 164 - .../web-docs-infoserver/css/timeline.css | 199 - .../font-awesome/css/font-awesome.css | 1338 --- .../font-awesome/css/font-awesome.min.css | 4 - .../font-awesome/fonts/FontAwesome.otf | Bin 62856 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 38205 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 414 - .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 80652 -> 0 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 44432 -> 0 bytes .../font-awesome/less/bordered-pulled.less | 16 - .../font-awesome/less/core.less | 12 - .../font-awesome/less/fixed-width.less | 6 - .../font-awesome/less/font-awesome.less | 17 - .../font-awesome/less/icons.less | 412 - .../font-awesome/less/larger.less | 13 - .../font-awesome/less/list.less | 19 - .../font-awesome/less/mixins.less | 20 - .../font-awesome/less/path.less | 14 - .../font-awesome/less/rotated-flipped.less | 9 - .../font-awesome/less/spinning.less | 30 - .../font-awesome/less/stacked.less | 20 - .../font-awesome/less/variables.less | 381 - .../font-awesome/scss/_bordered-pulled.scss | 16 - .../font-awesome/scss/_core.scss | 12 - .../font-awesome/scss/_fixed-width.scss | 6 - .../font-awesome/scss/_icons.scss | 412 - .../font-awesome/scss/_larger.scss | 13 - .../font-awesome/scss/_list.scss | 19 - .../font-awesome/scss/_mixins.scss | 20 - .../font-awesome/scss/_path.scss | 14 - .../font-awesome/scss/_rotated-flipped.scss | 9 - .../font-awesome/scss/_spinning.scss | 30 - .../font-awesome/scss/_stacked.scss | 20 - .../font-awesome/scss/_variables.scss | 381 - .../font-awesome/scss/font-awesome.scss | 17 - .../resources/web-docs-infoserver/history.html | 127 - .../resources/web-docs-infoserver/index.html | 224 - .../web-docs-infoserver/js/analyzer.js | 306 - .../web-docs-infoserver/js/bootstrap.js | 1951 ---- .../web-docs-infoserver/js/bootstrap.min.js | 6 - .../web-docs-infoserver/js/configuration.js | 40 - .../js/flot/chart-data-flot.js | 237 - .../web-docs-infoserver/js/flot/excanvas.min.js | 1 - .../web-docs-infoserver/js/flot/jquery.flot.js | 2599 ----- .../js/flot/jquery.flot.pie.js | 750 -- .../js/flot/jquery.flot.resize.js | 60 - .../js/flot/jquery.flot.tooltip.min.js | 12 - .../resources/web-docs-infoserver/js/helpers.js | 40 - .../web-docs-infoserver/js/jcanvas.min.js | 61 - .../js/jobmanagerFrontend.js | 471 - .../js/jquery.flot.categories.min.js | 44 - .../web-docs-infoserver/js/jquery.flot.min.js | 29 - .../web-docs-infoserver/js/jquery.flot.stack.js | 188 - .../js/jquery.flot.time.min.js | 9 - .../web-docs-infoserver/js/taskmanager.js | 50 - .../web-docs-infoserver/js/timeline.js | 6444 ------------ .../web-docs-infoserver/taskmanagers.html | 121 - .../runtime/jobmanager/web/WebInfoServer.java | 37 +- .../resources/web-docs-infoserver/analyze.html | 155 + .../web-docs-infoserver/blank-page.html | 116 + .../web-docs-infoserver/configuration.html | 122 + .../web-docs-infoserver/css/bootstrap.css | 5831 +++++++++++ .../web-docs-infoserver/css/bootstrap.min.css | 7 + .../web-docs-infoserver/css/nephelefrontend.css | 21 + .../web-docs-infoserver/css/sb-admin.css | 164 + .../web-docs-infoserver/css/timeline.css | 199 + .../font-awesome/css/font-awesome.css | 1338 +++ .../font-awesome/css/font-awesome.min.css | 4 + .../font-awesome/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes .../font-awesome/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes .../font-awesome/fonts/fontawesome-webfont.svg | 414 + .../font-awesome/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes .../font-awesome/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes .../font-awesome/less/bordered-pulled.less | 16 + .../font-awesome/less/core.less | 12 + .../font-awesome/less/fixed-width.less | 6 + .../font-awesome/less/font-awesome.less | 17 + .../font-awesome/less/icons.less | 412 + .../font-awesome/less/larger.less | 13 + .../font-awesome/less/list.less | 19 + .../font-awesome/less/mixins.less | 20 + .../font-awesome/less/path.less | 14 + .../font-awesome/less/rotated-flipped.less | 9 + .../font-awesome/less/spinning.less | 30 + .../font-awesome/less/stacked.less | 20 + .../font-awesome/less/variables.less | 381 + .../font-awesome/scss/_bordered-pulled.scss | 16 + .../font-awesome/scss/_core.scss | 12 + .../font-awesome/scss/_fixed-width.scss | 6 + .../font-awesome/scss/_icons.scss | 412 + .../font-awesome/scss/_larger.scss | 13 + .../font-awesome/scss/_list.scss | 19 + .../font-awesome/scss/_mixins.scss | 20 + .../font-awesome/scss/_path.scss | 14 + .../font-awesome/scss/_rotated-flipped.scss | 9 + .../font-awesome/scss/_spinning.scss | 30 + .../font-awesome/scss/_stacked.scss | 20 + .../font-awesome/scss/_variables.scss | 381 + .../font-awesome/scss/font-awesome.scss | 17 + .../resources/web-docs-infoserver/history.html | 127 + .../resources/web-docs-infoserver/index.html | 224 + .../web-docs-infoserver/js/analyzer.js | 306 + .../web-docs-infoserver/js/bootstrap.js | 1951 ++++ .../web-docs-infoserver/js/bootstrap.min.js | 6 + .../web-docs-infoserver/js/configuration.js | 40 + .../js/flot/chart-data-flot.js | 237 + .../web-docs-infoserver/js/flot/excanvas.min.js | 1 + .../web-docs-infoserver/js/flot/jquery.flot.js | 2599 +++++ .../js/flot/jquery.flot.pie.js | 750 ++ .../js/flot/jquery.flot.resize.js | 60 + .../js/flot/jquery.flot.tooltip.min.js | 12 + .../resources/web-docs-infoserver/js/helpers.js | 40 + .../web-docs-infoserver/js/jcanvas.min.js | 61 + .../js/jobmanagerFrontend.js | 471 + .../web-docs-infoserver/js/jquery-1.10.2.js | 6 + .../js/jquery.flot.categories.min.js | 44 + .../web-docs-infoserver/js/jquery.flot.min.js | 29 + .../web-docs-infoserver/js/jquery.flot.stack.js | 188 + .../js/jquery.flot.time.min.js | 9 + .../resources/web-docs-infoserver/js/jquery.js | 154 + .../web-docs-infoserver/js/taskmanager.js | 50 + .../web-docs-infoserver/js/timeline.js | 6444 ++++++++++++ .../web-docs-infoserver/taskmanagers.html | 121 + flink-shaded/pom.xml | 32 +- pom.xml | 30 +- 192 files changed, 54601 insertions(+), 54416 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/DEPENDENCIES ---------------------------------------------------------------------- diff --git a/DEPENDENCIES b/DEPENDENCIES index 9947b0d..1f421d6 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -165,7 +165,7 @@ The Apache Flink project packages the following fonts under the Open Font License (OFT) - http://scripts.sil.org/OFL/ - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy - -> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts" + -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts" http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 9069911..f4286fe 100644 --- a/LICENSE +++ b/LICENSE @@ -293,5 +293,5 @@ The Apache Flink project bundles the following fonts under the Open Font License (OFT) - http://scripts.sil.org/OFL/ - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy - -> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts" + -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts" http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-addons/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala ---------------------------------------------------------------------- diff --git a/flink-addons/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala b/flink-addons/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala index e305f5f..eab1b48 100644 --- a/flink-addons/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala +++ b/flink-addons/flink-yarn/src/main/scala/org/apache/flink/yarn/ApplicationMaster.scala @@ -69,8 +69,6 @@ object ApplicationMaster{ val taskManagerCount = env.get(Client.ENV_TM_COUNT).toInt val slots = env.get(Client.ENV_SLOTS).toInt val dynamicPropertiesEncodedString = env.get(Client.ENV_DYNAMIC_PROPERTIES) - val localWebInterfaceDir = - s"$currDir/resources/${ConfigConstants.DEFAULT_JOB_MANAGER_WEB_PATH_NAME}" val appNumber = env.get(Client.ENV_APP_NUMBER).toInt @@ -84,8 +82,8 @@ object ApplicationMaster{ val jobManagerWebPort = GlobalConfiguration.getInteger(ConfigConstants .JOB_MANAGER_WEB_PORT_KEY, ConfigConstants.DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT) - generateConfigurationFile(currDir, ownHostname, jobManagerPort, localWebInterfaceDir, - jobManagerWebPort, logDirs, slots, taskManagerCount, dynamicPropertiesEncodedString) + generateConfigurationFile(currDir, ownHostname, jobManagerPort, jobManagerWebPort, + logDirs, slots, taskManagerCount, dynamicPropertiesEncodedString) val (system, actor) = startJobManager(currDir) @@ -114,8 +112,9 @@ object ApplicationMaster{ } def generateConfigurationFile(currDir: String, ownHostname: String, jobManagerPort: Int, - localWebInterfaceDir: String, jobManagerWebPort: Int, logDirs: - String, slots: Int, taskManagerCount: Int, dynamicPropertiesEncodedString: String): Unit = { + jobManagerWebPort: Int, logDirs: String, slots: Int, + taskManagerCount: Int, dynamicPropertiesEncodedString: String) + : Unit = { val output = new PrintWriter(new BufferedWriter(new FileWriter(s"$currDir/flink-conf-modified" + s".yaml"))) @@ -128,7 +127,6 @@ object ApplicationMaster{ output.println(s"${ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY}: $ownHostname") output.println(s"${ConfigConstants.JOB_MANAGER_IPC_PORT_KEY}: $jobManagerPort") - output.println(s"${ConfigConstants.JOB_MANAGER_WEB_ROOT_PATH_KEY}: $localWebInterfaceDir") output.println(s"${ConfigConstants.JOB_MANAGER_WEB_LOG_PATH_KEY}: $logDirs") output.println(s"${ConfigConstants.JOB_MANAGER_WEB_PORT_KEY}: $jobManagerWebPort") @@ -151,8 +149,6 @@ object ApplicationMaster{ } def startJobManager(currDir: String): (ActorSystem, ActorRef) = { -// Utils.copyJarContents(s"resources/${ConfigConstants.DEFAULT_JOB_MANAGER_WEB_PATH_NAME}", -// classOf[YarnMaster].getProtectionDomain.getCodeSource.getLocation.getPath) val pathToConfig = s"$currDir/flink-conf.modified.yaml" val args = Array[String]("--configDir", pathToConfig) http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/76d603c0/flink-addons/pom.xml ---------------------------------------------------------------------- diff --git a/flink-addons/pom.xml b/flink-addons/pom.xml index 27783d1..be3cfa9 100644 --- a/flink-addons/pom.xml +++ b/flink-addons/pom.xml @@ -34,11 +34,11 @@ under the License. <packaging>pom</packaging> <modules> - <!--<module>flink-avro</module>--> - <!--<module>flink-jdbc</module>--> - <!--<module>flink-spargel</module>--> - <!--<module>flink-hadoop-compatibility</module>--> - <!--<module>flink-streaming</module>--> + <module>flink-avro</module> + <module>flink-jdbc</module> + <module>flink-spargel</module> + <module>flink-hadoop-compatibility</module> + <module>flink-streaming</module> <module>flink-hbase</module> </modules>
