Merge #29 on WebServer integration
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/4e8edab4 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/4e8edab4 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/4e8edab4 Branch: refs/heads/master Commit: 4e8edab4f66308a6577dbcde01b2b8ab95510552 Parents: 592e47f 79a970b Author: Clebert Suconic <[email protected]> Authored: Tue Dec 2 11:56:02 2014 -0500 Committer: Clebert Suconic <[email protected]> Committed: Tue Dec 2 11:56:20 2014 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/cli/commands/Run.java | 24 +- .../activemq/components/ExternalComponent.java | 25 ++ activemq-dto/pom.xml | 7 +- .../java/org/apache/activemq/dto/AppDTO.java | 34 +++ .../java/org/apache/activemq/dto/BrokerDTO.java | 8 + .../org/apache/activemq/dto/ComponentDTO.java | 30 +++ .../org/apache/activemq/dto/WebServerDTO.java | 43 ++++ activemq-journal/pom.xml | 38 --- activemq-selector/pom.xml | 37 --- activemq-web/pom.xml | 47 ++++ .../activemq/component/WebServerComponent.java | 112 +++++++++ .../activemq/test/WebServerComponentTest.java | 125 ++++++++++ .../webapps/WebServerComponentTest.txt | 1 + activemq-website/pom.xml | 96 ++++++++ .../src/main/resources/images/activemq-logo.png | Bin 0 -> 6819 bytes activemq-website/src/main/resources/index.html | 64 +++++ .../resources/styles/impact/css/pygmentize.css | 127 ++++++++++ .../main/resources/styles/impact/css/site.css | 235 +++++++++++++++++++ distribution/activemq/pom.xml | 30 ++- distribution/activemq/src/main/assembly/dep.xml | 60 +++-- .../resources/config/clustered/bootstrap.xml | 9 +- .../config/non-clustered/bootstrap.xml | 9 +- .../resources/config/replicated/bootstrap.xml | 9 +- .../resources/config/shared-store/bootstrap.xml | 9 +- docs/user-manual/pom.xml | 36 +-- pom.xml | 27 +++ readme.txt | 0 27 files changed, 1113 insertions(+), 129 deletions(-) ----------------------------------------------------------------------
