You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/10/31 14:39:55 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1491 - removed duplicate
Jolokia instance
ARTEMIS-1491 - removed duplicate Jolokia instance
https://issues.apache.org/jira/browse/ARTEMIS-1491
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/804e12c7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/804e12c7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/804e12c7
Branch: refs/heads/master
Commit: 804e12c7ce054541a4127c3922beb90d06157653
Parents: de69673
Author: Andy Taylor <an...@gmail.com>
Authored: Tue Oct 31 14:18:24 2017 +0000
Committer: Justin Bertram <jb...@apache.org>
Committed: Tue Oct 31 09:33:10 2017 -0500
----------------------------------------------------------------------
.../artemis/cli/commands/etc/bootstrap-web-settings.txt | 1 -
artemis-distribution/pom.xml | 5 -----
artemis-distribution/src/main/assembly/dep.xml | 8 --------
.../activemq/artemis/component/WebServerComponent.java | 9 ++-------
docs/user-manual/en/management.md | 2 +-
docs/user-manual/en/security.md | 2 +-
pom.xml | 8 --------
7 files changed, 4 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index feb179c..e863c1a 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,6 +1,5 @@
<!-- The web server is only bound to localhost by default -->
<web bind="${web.protocol}://${http.host}:${http.port}" path="web"${extra.web.attributes}>
- <app url="jolokia" war="jolokia.war"/>
<app url="activemq-branding" war="activemq-branding.war"/>
<app url="artemis-plugin" war="artemis-plugin.war"/>
<app url="console" war="console.war"/>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/artemis-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index bd93cad..19aef75 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -164,11 +164,6 @@
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.jolokia</groupId>
- <artifactId>jolokia-war</artifactId>
- <type>war</type>
- </dependency>
<!-- Management Console Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/artemis-distribution/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 3c16d8c..057d8c8 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -135,14 +135,6 @@
<outputDirectory>web/api</outputDirectory>
<unpack>true</unpack>
</dependencySet>
- <dependencySet>
- <includes>
- <include>org.jolokia:jolokia-war:war</include>
- </includes>
- <outputDirectory>web</outputDirectory>
- <unpack>false</unpack>
- <outputFileNameMapping>jolokia.war</outputFileNameMapping>
- </dependencySet>
<!-- Management Console Dependencies -->
<dependencySet>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index be21198..9964c71 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -54,7 +54,6 @@ public class WebServerComponent implements ExternalComponent {
private HandlerList handlers;
private WebServerDTO webServerConfig;
private URI uri;
- private String jolokiaUrl;
private String consoleUrl;
private List<WebAppContext> webContexts;
private ServerConnector connector;
@@ -103,9 +102,6 @@ public class WebServerComponent implements ExternalComponent {
for (AppDTO app : webServerConfig.apps) {
WebAppContext webContext = deployWar(app.url, app.war, warDir);
webContexts.add(webContext);
- if (app.war.startsWith("jolokia")) {
- jolokiaUrl = webServerConfig.bind + "/" + app.url;
- }
if (app.war.startsWith("console")) {
consoleUrl = webServerConfig.bind + "/" + app.url;
}
@@ -137,10 +133,9 @@ public class WebServerComponent implements ExternalComponent {
}
server.start();
ActiveMQWebLogger.LOGGER.webserverStarted(webServerConfig.bind);
- if (jolokiaUrl != null) {
- ActiveMQWebLogger.LOGGER.jolokiaAvailable(jolokiaUrl);
- }
+
if (consoleUrl != null) {
+ ActiveMQWebLogger.LOGGER.jolokiaAvailable(consoleUrl + "/jolokia");
ActiveMQWebLogger.LOGGER.consoleAvailable(consoleUrl);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/docs/user-manual/en/management.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/management.md b/docs/user-manual/en/management.md
index 34a2f45..8b17d87 100644
--- a/docs/user-manual/en/management.md
+++ b/docs/user-manual/en/management.md
@@ -471,7 +471,7 @@ HTTP agent deployed as a Web Application. Jolokia is a remote
JMX-over-HTTP bridge that exposes MBeans. For a full guide as
to how to use it refer to [Jolokia Documentation](http://www.jolokia.org/documentation.html),
however a simple example to query the broker's version would
-be to use a browser and go to the URL [http://username:password@localhost:8161/jolokia/read/org.apache.activemq.artemis:broker="0.0.0.0"/Version]().
+be to use a browser and go to the URL [http://username:password@localhost:8161/console/jolokia/read/org.apache.activemq.artemis:broker="0.0.0.0"/Version]().
This would give you back something like the following:
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index 1ddd5cc..b14aee6 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -748,7 +748,7 @@ Artemis comes with a web console that allows user to browse Artemis documentatio
web access is plain HTTP. It is configured in `bootstrap.xml`:
<web bind="http://localhost:8161" path="web">
- <app url="jolokia" war="jolokia-war-1.3.5.war"/>
+ <app url="console" war="console.war"/>
</web>
Alternatively you can edit the above configuration to enable secure access using HTTPS protocol. e.g.:
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/804e12c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dbab986..70daf3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
<johnzon.version>0.9.5</johnzon.version>
<json-p.spec.version>1.0-alpha-1</json-p.spec.version>
<javax.inject.version>1</javax.inject.version>
- <jolokia.version>1.3.7</jolokia.version>
<hawtbuff.version>1.11</hawtbuff.version>
<jb.logmanager.version>2.0.3.Final</jb.logmanager.version>
<jb.slf4j-jboss-logmanager.version>1.0.3.GA</jb.slf4j-jboss-logmanager.version>
@@ -636,13 +635,6 @@
<artifactId>tomcat-servlet-api</artifactId>
<version>8.5.5</version>
</dependency>
- <dependency>
- <groupId>org.jolokia</groupId>
- <artifactId>jolokia-war</artifactId>
- <type>war</type>
- <version>${jolokia.version}</version>
- <!-- License: Apache 2.0 -->
- </dependency>
<!-- ## End Jetty Wed Dependencies ## -->
<dependency>