Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
* 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider: SLIDER-1042 Use the correct cluster name when fetching the description SLIDER-1041 Fix consistency for exports, enumerate all exports on HTML index. SLIDER-1040 Better formatting on the AM's web ui. SLIDER-1012 Modify server and quicklinks for Tomcat (fengyongshe) SLIDER-809 First implementation of an Apache Tomcat app-package SLIDER-1039 Run python tests from target directory Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0992e855 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0992e855 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0992e855 Branch: refs/heads/develop Commit: 0992e85500239d88f77cbd76f142b1daf02d5219 Parents: b99a3d9 268cdbf Author: Steve Loughran <ste...@apache.org> Authored: Wed Jan 6 19:25:23 2016 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Jan 6 19:25:23 2016 +0000 ---------------------------------------------------------------------- .gitignore | 1 - app-packages/pom.xml | 2 + app-packages/tomcat/LICENSE.txt | 206 ++++++++++++++++ app-packages/tomcat/NOTICE.txt | 45 ++++ app-packages/tomcat/README.md | 64 +++++ app-packages/tomcat/appConfig-default.json | 23 ++ app-packages/tomcat/metainfo.xml | 93 +++++++ app-packages/tomcat/package/scripts/params.py | 36 +++ app-packages/tomcat/package/scripts/tomcat.py | 80 ++++++ .../tomcat/package/templates/server.xml.j2 | 142 +++++++++++ .../package/templates/tomcat-users.xml.j2 | 35 +++ app-packages/tomcat/pom.xml | 241 +++++++++++++++++++ app-packages/tomcat/resources-default.json | 16 ++ app-packages/tomcat/src/assembly/tomcat.xml | 78 ++++++ .../tomcat/TomcatAgentCommandTestBase.groovy | 40 +++ .../slider/funtest/tomcat/TomcatBasicIT.groovy | 214 ++++++++++++++++ .../tomcat/StubToForceGroovyTestsToCompile.java | 22 ++ .../src/test/resources/appConfig-default.json | 23 ++ .../tomcat/src/test/resources/resources.json | 16 ++ .../tomcat/src/test/resources/slider-test.war | Bin 0 -> 3694967 bytes slider-agent/pom.xml | 78 +++++- slider-assembly/pom.xml | 42 +++- .../providers/AbstractProviderService.java | 8 +- .../apache/slider/providers/MonitorDetail.java | 43 ++++ .../slider/providers/ProviderService.java | 4 +- .../slider/providers/agent/AgentKeys.java | 3 + .../providers/agent/AgentProviderService.java | 32 ++- .../web/rest/publisher/PublisherResource.java | 3 +- .../server/appmaster/web/view/IndexBlock.java | 48 +++- .../src/main/resources/webapps/static/yarn.css | 4 +- .../providers/agent/TestBuildBasicAgent.groovy | 2 +- 31 files changed, 1605 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
