Merge commit 'refs/pull/7/head' of https://github.com/apache/incubator-freemarker-online-tester
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/commit/5291fabb Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/tree/5291fabb Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-online-tester/diff/5291fabb Branch: refs/heads/master Commit: 5291fabbdec105e96502b1aa64634c2b648b14d7 Parents: 808bd53 7ebefc2 Author: ddekany <[email protected]> Authored: Tue May 2 10:59:46 2017 +0200 Committer: ddekany <[email protected]> Committed: Tue May 2 10:59:46 2017 +0200 ---------------------------------------------------------------------- .gitignore | 1 + .travis.yml | 1 + README.md | 4 -- build.gradle | 12 ++-- dependencies.gradle | 19 ++++--- intellij.gradle | 2 +- .../dropwizard/ApplicationStartup.java | 42 -------------- .../dropwizard/FreeMarkerOnlineTester.java | 58 ++++++++++++++++++++ .../FreeMarkerOnlineTesterConfiguration.java | 8 +++ .../healthchecks/MyProjectHealthCheck.java | 7 +-- .../onlinetester/resources/TestResource.java | 18 ++++++ .../spring/SpringConfiguration.java | 8 +++ .../onlinetester/view/FreeMarkerOnlineView.java | 2 +- src/main/resources/freemarker-online.yml | 36 +++++------- src/main/resources/view/freemarker-online.ftl | 4 +- .../platform/DropWizardServiceTest.java | 10 ++-- 16 files changed, 136 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
