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: 11-Sep-2009 21:27:12
Branch: HEAD Handle: 2009091120271200
Modified files:
openpkg-src/activemq activemq.spec activemq.txt
Log:
try to better integrate the ActiveMQ webservices
Summary:
Revision Changes Path
1.5 +5 -2 openpkg-src/activemq/activemq.spec
1.6 +32 -19 openpkg-src/activemq/activemq.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/activemq/activemq.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 activemq.spec
--- openpkg-src/activemq/activemq.spec 11 Sep 2009 15:14:39 -0000
1.4
+++ openpkg-src/activemq/activemq.spec 11 Sep 2009 19:27:12 -0000
1.5
@@ -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/rest/WEB-INF \
+ $RPM_BUILD_ROOT%{l_prefix}/share/activemq/service/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
@@ -102,7 +102,10 @@
sed -e "1,/^<file name=\"$name\">/d" -e "/<\/file>/,\$d" >$name
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/
+ $name
$RPM_BUILD_ROOT%{l_prefix}/share/activemq/service/WEB-INF/
+ elif [ ".$name" = ".activemq.conf" ]; then
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ $name $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/
else
%{l_shtool} install -c -m 644 %{l_value -s -a} \
$name $RPM_BUILD_ROOT%{l_prefix}/etc/activemq/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/activemq/activemq.txt
============================================================================
$ cvs diff -u -r1.5 -r1.6 activemq.txt
--- openpkg-src/activemq/activemq.txt 11 Sep 2009 15:14:39 -0000 1.5
+++ openpkg-src/activemq/activemq.txt 11 Sep 2009 19:27:12 -0000 1.6
@@ -11,14 +11,14 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core
- http://activemq.apache.org/schema/core/activemq-core.xsd
+ http://activemq.apache.org/schema/core/activemq-core.xsd
http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd";>
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<value>file:///@l_prefix@/etc/activemq/activemq.properties</value>
- </property>
+ </property>
</bean>
<broker
@@ -65,7 +65,7 @@
trustStore="file:@l_prefix@/etc/activemq/activemq.broker.ts"
trustStorePassword="password"
/>
</sslContext>
-
+
<systemUsage>
<systemUsage>
<memoryUsage>
@@ -117,13 +117,13 @@
<jetty xmlns="http://mortbay.com/schemas/jetty/1.0";>
<connectors>
- <nioConnector port="8161"/>
+ <nioConnector host="localhost" port="8161"/>
</connectors>
<handlers>
- <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"/> -->
+ <webAppContext contextPath="/activemq/admin"
resourceBase="@l_prefix@/share/activemq/admin" logUrlOnStart="true"/>
+ <webAppContext contextPath="/activemq/service"
resourceBase="@l_prefix@/share/activemq/service" logUrlOnStart="true"/>
+ <!-- <webAppContext contextPath="/activemq/demo"
resourceBase="@l_prefix@/share/activemq/demo" logUrlOnStart="true"/> -->
+ <!-- <webAppContext contextPath="/activemq/fileserver"
resourceBase="@l_prefix@/share/activemq/fileserver" logUrlOnStart="true"/> -->
</handlers>
</jetty>
</beans>
@@ -180,35 +180,36 @@
</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>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>MessageServlet4Ajax</servlet-name>
+ <servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet>
<servlet-name>QueueBrowseServlet</servlet-name>
<servlet-class>org.apache.activemq.web.QueueBrowseServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>AjaxServlet</servlet-name>
- <url-pattern>/ajax/*</url-pattern>
+ <servlet-name>MessageServlet</servlet-name>
+ <url-pattern>/rest/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>MessageServlet</servlet-name>
- <url-pattern>/message/*</url-pattern>
+ <servlet-name>MessageServlet4Ajax</servlet-name>
+ <url-pattern>/ajax/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>QueueBrowseServlet</servlet-name>
- <url-pattern>/queue-browse/*</url-pattern>
+ <url-pattern>/browse/*</url-pattern>
</servlet-mapping>
<filter>
@@ -221,3 +222,15 @@
</filter-mapping>
</web-app>
</file>
+<file name="activemq.conf">
+##
+## activemq.conf: ActiveMQ Apache configuration
+##
+
+# global URL integration mapping
+# (mainly to circumvent cross-browser access control checks
+# and to allow correct path mapping for JSESSIONID cookie)
+ProxyPass /activemq/ http://localhost:8161/activemq/
+ProxyPassReverse /activemq/ http://localhost:8161/activemq/
+
+</file>
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
