activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1420809 - in /activemq/trunk/assembly: pom.xml src/main/descriptors/common-bin.xml src/release/conf/jetty.xml src/release/webapps/api/ src/release/webapps/api/WEB-INF/ src/release/webapps/api/WEB-INF/web.xml
Date Wed, 12 Dec 2012 16:25:21 GMT
Author: dejanb
Date: Wed Dec 12 16:25:19 2012
New Revision: 1420809

URL: http://svn.apache.org/viewvc?rev=1420809&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4219 - jolokia support

Added:
    activemq/trunk/assembly/src/release/webapps/api/
    activemq/trunk/assembly/src/release/webapps/api/WEB-INF/
    activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml
Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml
    activemq/trunk/assembly/src/release/conf/jetty.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1420809&r1=1420808&r2=1420809&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Wed Dec 12 16:25:19 2012
@@ -30,6 +30,15 @@
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
 
+  <!-- Maven repository hosting Jolokia -->
+  <repositories>
+    <repository>
+    <id>labs-consol-release</id>
+        <name>ConSol* Labs Repository (Releases)</name>
+        <url>http://labs.consol.de/maven/repository</url>
+    </repository>
+  </repositories>
+
   <dependencies>
 
     <!-- activemq -->
@@ -362,6 +371,16 @@
       <artifactId>xmlParserAPIs</artifactId>
       <version>2.6.2</version>
     </dependency>
+    <dependency>
+      <groupId>org.jolokia</groupId>
+      <artifactId>jolokia-core</artifactId>
+      <version>1.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+      <version>1.1</version>
+    </dependency>
 
   </dependencies>
 

Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=1420809&r1=1420808&r2=1420809&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Wed Dec 12 16:25:19 2012
@@ -223,6 +223,10 @@
         <!-- Atom/RSS support -->
         <include>rome:rome</include>
         <include>jdom:jdom</include>
+
+        <!-- REST API -->
+        <include>org.jolokia:jolokia-core</include>
+        <include>com.googlecode.json-simple:json-simple</include>
       </includes>
     </dependencySet>
   </dependencySets>

Modified: activemq/trunk/assembly/src/release/conf/jetty.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/conf/jetty.xml?rev=1420809&r1=1420808&r2=1420809&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/conf/jetty.xml (original)
+++ activemq/trunk/assembly/src/release/conf/jetty.xml Wed Dec 12 16:25:19 2012
@@ -59,6 +59,11 @@
                             <property name="logUrlOnStart" value="true" />
                             <property name="parentLoaderPriority" value="true" />
                         </bean>
+                        <bean class="org.eclipse.jetty.webapp.WebAppContext">
+                            <property name="contextPath" value="/api" />
+                            <property name="resourceBase" value="${activemq.home}/webapps/api"
/>
+                            <property name="logUrlOnStart" value="true" />
+                        </bean>
                         <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
                             <property name="directoriesListed" value="false" />
                             <property name="welcomeFiles">

Added: 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=1420809&view=auto
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml (added)
+++ activemq/trunk/assembly/src/release/webapps/api/WEB-INF/web.xml Wed Dec 12 16:25:19 2012
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!DOCTYPE web-app
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+    <display-name>Apache ActiveMQ REST API</display-name>
+
+    <servlet>
+        <servlet-name>MessageServlet</servlet-name>
+        <servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <!--
+        Uncomment this parameter if you plan to use multiple consumers over REST
+        <init-param>
+                <param-name>destinationOptions</param-name>
+                <param-value>consumer.prefetchSize=1</param-value>
+        </init-param>
+        -->
+    </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



Mime
View raw message