X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;h=9de9501a6b8260d6e7a9bc51c66bfdafd095a1e2;hb=d95951ffda520440eea45647d0d672382e6d8171;hp=55a5734493649f255a6a2f55f6eff63ab27644a4;hpb=71412758e17f020094abef5dc2569c3e6386309e;p=gpl%2Fargeo-slc.git

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..9de9501a6 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
@@ -28,28 +28,6 @@
 		<url-pattern>/slcService/*</url-pattern>
 	</servlet-mapping>
 
-	<!-- WEB servlet -->
-	<servlet>
-		<servlet-name>slc-web</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-web</servlet-name>
-		<url-pattern>*.web</url-pattern>
-	</servlet-mapping>
-
-	<!-- UI servlet -->
-	<servlet>
-		<servlet-name>slc-ui</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-ui</servlet-name>
-		<url-pattern>*.ui</url-pattern>
-	</servlet-mapping>
-
 	<!-- XSLT servlet -->
 	<servlet>
 		<servlet-name>xslt</servlet-name>
@@ -87,15 +65,6 @@
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
-	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>/WEB-INF/slc-jsp/*.jsp</url-pattern>
-			<page-encoding>ISO-8859-1</page-encoding>
-			<include-prelude>/WEB-INF/specific/prelude.jspf</include-prelude>
-			<include-coda>/WEB-INF/specific/coda.jspf</include-coda>
-		</jsp-property-group>
-	</jsp-config>
-
 	<!-- Env refs -->
 	<resource-env-ref>
 		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
@@ -116,4 +85,38 @@
 		<param-value>5000</param-value>
 	</context-param>
 
+
+	<!-- Active MQ -->
+	    <!-- context config -->
+    <context-param>
+        <param-name>org.apache.activemq.brokerURL</param-name>
+        <param-value>vm://localhost</param-value>
+    </context-param>
+
+    <context-param>
+        <param-name>org.apache.activemq.embeddedBroker</param-name>
+        <param-value>false</param-value>
+    </context-param>
+
+    <!-- servlet mappings -->
+    <servlet>
+        <servlet-name>MessageListenerServlet</servlet-name>
+        <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>MessageListenerServlet</servlet-name>
+        <url-pattern>/amq/*</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>/amq/*</url-pattern>
+    </filter-mapping>
 </web-app>