You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/06/26 14:36:22 UTC
svn commit: r1496904 - in /activemq/trunk/assembly/src/release:
conf/jetty.xml webapps/api/WEB-INF/web.xml
Author: dejanb
Date: Wed Jun 26 12:36:22 2013
New Revision: 1496904
URL: http://svn.apache.org/r1496904
Log:
https://issues.apache.org/jira/browse/AMQ-4594 - make old jolokia api obsolete and redirect to the one started by hawtio
Modified:
activemq/trunk/assembly/src/release/conf/jetty.xml
activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml
Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=1496904&r1=1496903&r2=1496904&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Wed Jun 26 12:36:22 2013
@@ -87,6 +87,17 @@
</property>
</bean>
+ <bean id="rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+ <property name="rules">
+ <set>
+ <bean class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule">
+ <property name="regex" value="/api/jolokia(.*)"/>
+ <property name="replacement" value="/hawtio/jolokia$1"/>
+ </bean>
+ </set>
+ </property>
+ </bean>
+
<bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
</bean>
@@ -115,6 +126,7 @@
<bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
<property name="handlers">
<list>
+ <ref bean="rewrite"/>
<ref bean="contexts" />
<ref bean="securityHandler" />
</list>
Modified: activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml?rev=1496904&r1=1496903&r2=1496904&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml (original)
+++ activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml Wed Jun 26 12:36:22 2013
@@ -36,20 +36,9 @@
-->
</servlet>
- <servlet>
- <servlet-name>jolokia-agent</servlet-name>
- <servlet-class>org.jolokia.http.AgentServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
<servlet-mapping>
<servlet-name>MessageServlet</servlet-name>
<url-pattern>/message/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>jolokia-agent</servlet-name>
- <url-pattern>/jolokia/*</url-pattern>
- </servlet-mapping>
-
</web-app>
\ No newline at end of file