From fc506da61f90d4dd44bf6aa7433c73ec6142590d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 10 Jan 2009 18:41:34 +0000 Subject: [PATCH] Integrate ActiveMQ on the server side git-svn-id: https://svn.argeo.org/slc/trunk@2072 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/webapp/WEB-INF/activemq.xml | 159 ++++++++++++++++++ .../webapp/WEB-INF/applicationContext.xml | 15 +- .../webapp/WEB-INF/classes/log4j.properties | 3 + .../src/main/webapp/WEB-INF/web.xml | 75 +++++++++ .../src/main/webapp/index.jsp | 2 +- .../src/main/webapp/test-amq/send.html | 7 + .../src/main/webapp/test-amq/send.js | 3 + org.argeo.slc/pom.xml | 39 +++-- runtime/org.argeo.slc.server/pom.xml | 31 +++- 9 files changed, 307 insertions(+), 27 deletions(-) create mode 100644 org.argeo.slc.webapp/src/main/webapp/WEB-INF/activemq.xml create mode 100644 org.argeo.slc.webapp/src/main/webapp/test-amq/send.html create mode 100644 org.argeo.slc.webapp/src/main/webapp/test-amq/send.js diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/activemq.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/activemq.xml new file mode 100644 index 000000000..71744743e --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/activemq.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml index 080a075fc..131fb21b0 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -1,15 +1,20 @@ - + - + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties index 93d424ffd..e80a39052 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties @@ -19,6 +19,9 @@ log4j.logger.org.hibernate.transaction=WARN #log4j.logger.org.hibernate.tool.hbm2ddl=TRACE #log4j.logger.org.hibernate.type=TRACE +# Active MQ +log4j.logger.org.apache.activemq.web.MessageListenerServlet=DEBUG + # EhCache log4j.logger.net.sf.ehcache=WARN diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml index 55a573449..d7105cf49 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml @@ -116,4 +116,79 @@ 5000 + + + + + org.apache.activemq.brokerURL + vm://localhost + + + + org.apache.activemq.embeddedBroker + false + + + + + + + AjaxServlet + org.apache.activemq.web.AjaxServlet + 1 + + + + MessageServlet + org.apache.activemq.web.MessageServlet + 1 + + + + + + + QueueBrowseServlet + org.apache.activemq.web.QueueBrowseServlet + + + + AjaxServlet + /amq/* + + + + MessageServlet + /amqMessage/* + + + + QueueBrowseServlet + /amqQueueBrowse/* + + + + session + org.apache.activemq.web.SessionFilter + + + + session + /amq/* + + + session + /amqMessage/* + + + session + /amqQueueBrowse/* + + diff --git a/org.argeo.slc.webapp/src/main/webapp/index.jsp b/org.argeo.slc.webapp/src/main/webapp/index.jsp index 9cdd98efc..1c9726909 100644 --- a/org.argeo.slc.webapp/src/main/webapp/index.jsp +++ b/org.argeo.slc.webapp/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html"%> <% -response.sendRedirect("build/index.html"); +response.sendRedirect("argeo-ria/index.html"); %> diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html new file mode 100644 index 000000000..4449fcbc5 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js new file mode 100644 index 000000000..f40d3c49b --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js @@ -0,0 +1,3 @@ +amq.sendMessage('TEST.QUEUE','My Test'); +alert('Message sent!'); +document.write('Message sent'); \ No newline at end of file diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 974e55238..0ef2bd723 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -159,37 +159,27 @@ limitations under the License. 1.3.0 - + 2.3.0 + --> @@ -619,12 +609,21 @@ limitations under the License. com.springsource.org.apache.activemq ${version.activemq} + + org.apache.activemq + com.springsource.org.apache.activemq.web + ${version.activemq} + org.apache.xbean com.springsource.org.apache.xbean.spring 3.3.0 - + + org.apache.geronimo.specs + com.springsource.javax.management.j2ee + 1.0.1 + diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml index 78eb3375e..223116e07 100644 --- a/runtime/org.argeo.slc.server/pom.xml +++ b/runtime/org.argeo.slc.server/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -48,6 +49,12 @@ ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml + + + activemq.base + ${user.home}/share/apache-activemq-5.2.0 + + @@ -110,5 +117,27 @@ com.springsource.javax.wsdl + + + javax.jms + com.springsource.javax.jms + + + org.apache.activemq + com.springsource.org.apache.activemq + + + org.apache.xbean + com.springsource.org.apache.xbean.spring + + + org.apache.activemq + com.springsource.org.apache.activemq.web + + + org.apache.geronimo.specs + com.springsource.javax.management.j2ee + + -- 2.39.2