OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 03-Jun-2009 10:55:09 Branch: HEAD Handle: 2009060309550900 Modified files: openpkg-src/activemq activemq.spec activemq.txt Log: add standalone REST services Summary: Revision Changes Path 1.2 +9 -4 openpkg-src/activemq/activemq.spec 1.2 +66 -3 openpkg-src/activemq/activemq.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/activemq/activemq.spec ============================================================================ $ cvs diff -u -r1.1 -r1.2 activemq.spec --- openpkg-src/activemq/activemq.spec 2 Jun 2009 21:18:14 -0000 1.1 +++ openpkg-src/activemq/activemq.spec 3 Jun 2009 08:55:09 -0000 1.2 @@ -32,7 +32,7 @@ Group: Network License: Apache Version: 5.2.0 -Release: 20090602 +Release: 20090603 # list of sources Source0: http://www.apache.org/dist/activemq/apache-activemq/%{version}/apache-activemq-%{version}-bin.tar.gz @@ -74,7 +74,7 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ $RPM_BUILD_ROOT%{l_prefix}/etc/activemq \ $RPM_BUILD_ROOT%{l_prefix}/libexec/activemq \ - $RPM_BUILD_ROOT%{l_prefix}/share/activemq \ + $RPM_BUILD_ROOT%{l_prefix}/share/activemq/rest/WEB-INF \ $RPM_BUILD_ROOT%{l_prefix}/var/activemq/run \ $RPM_BUILD_ROOT%{l_prefix}/var/activemq/log \ $RPM_BUILD_ROOT%{l_prefix}/var/activemq/data @@ -100,8 +100,13 @@ for name in `grep "^<file" %{SOURCE activemq.txt} | sed -e 's;^.*name=";;' -e 's;".*$;;'`; do (echo ""; cat %{SOURCE activemq.txt}; echo "") |\ sed -e "1,/^<file name=\"$name\">/d" -e "/<\/file>/,\$d" >$name - %{l_shtool} install -c -m 644 %{l_value -s -a} \ - $name $RPM_BUILD_ROOT%{l_prefix}/etc/activemq/ + if [ ".$name" = ".web.xml" ]; then + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + $name $RPM_BUILD_ROOT%{l_prefix}/share/activemq/rest/WEB-INF/ + else + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + $name $RPM_BUILD_ROOT%{l_prefix}/etc/activemq/ + fi done %{l_shtool} install -c -m 644 \ conf/broker.ks $RPM_BUILD_ROOT%{l_prefix}/etc/activemq/activemq.broker.ks @@ . patch -p0 <<'@@ .' Index: openpkg-src/activemq/activemq.txt ============================================================================ $ cvs diff -u -r1.1 -r1.2 activemq.txt --- openpkg-src/activemq/activemq.txt 2 Jun 2009 21:18:14 -0000 1.1 +++ openpkg-src/activemq/activemq.txt 3 Jun 2009 08:55:09 -0000 1.2 @@ -116,9 +116,10 @@ <nioConnector port="8161"/> </connectors> <handlers> - <webAppContext contextPath="/admin" resourceBase="@l_prefix@/share/activemq/admin" logUrlOnStart="true"/> - <webAppContext contextPath="/demo" resourceBase="@l_prefix@/share/activemq/demo" logUrlOnStart="true"/> - <webAppContext contextPath="/fileserver" resourceBase="@l_prefix@/share/activemq/fileserver" logUrlOnStart="true"/> + <webAppContext contextPath="/admin"resourceBase="@l_prefix@/share/activemq/admin" logUrlOnStart="true"/> + <webAppContext contextPath="/rest" resourceBase="@l_prefix@/share/activemq/rest" logUrlOnStart="true"/> + <!-- <webAppContext contextPath="/demo" resourceBase="@l_prefix@/share/activemq/demo" logUrlOnStart="true"/> --> + <!-- <webAppContext contextPath="/fileserver" resourceBase="@l_prefix@/share/activemq/fileserver" logUrlOnStart="true"/> --> </handlers> </jetty> </beans> @@ -154,3 +155,65 @@ log4j.appender.logfile.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n </file> +<file name="web.xml"> +<?xml version="1.0" encoding="UTF-8"?> +<!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>ActiveMQ REST Service</display-name> + <description>ActiveMQ REST Service</description> + + <context-param> + <param-name>org.apache.activemq.brokerURL</param-name> + <param-value>vm://localhost</param-value> + <description>The URL of the Message Broker to connect to</description> + </context-param> + <context-param> + <param-name>org.apache.activemq.embeddedBroker</param-name> + <param-value>true</param-value> + <description>Whether we should include an embedded broker or not</description> + </context-param> + + <servlet> + <servlet-name>AjaxServlet</servlet-name> + <servlet-class>org.apache.activemq.web.AjaxServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>MessageServlet</servlet-name> + <servlet-class>org.apache.activemq.web.MessageServlet</servlet-class> + <load-on-startup>1</load-on-startup> + <init-param> + <param-name>destinationOptions</param-name> + <param-value>consumer.prefetchSize=1</param-value> + </init-param> + </servlet> + <servlet> + <servlet-name>QueueBrowseServlet</servlet-name> + <servlet-class>org.apache.activemq.web.QueueBrowseServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>AjaxServlet</servlet-name> + <url-pattern>/ajax/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>MessageServlet</servlet-name> + <url-pattern>/message/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>QueueBrowseServlet</servlet-name> + <url-pattern>/queue-browse/*</url-pattern> + </servlet-mapping> + + <filter> + <filter-name>session</filter-name> + <filter-class>org.apache.activemq.web.SessionFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>session</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> +</web-app> +</file> @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org