https://issues.apache.org/jira/browse/AMQ-4594 - make old jolokia api obsolete and redirect to the one started by hawtio

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1496904 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/release/conf/jetty.xml

@@ -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>

assembly/src/release/webapps/api/WEB-INF/web.xml

@@ -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>