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=abde0c29951b9b95d79a29c364e178f96ab98f05;hpb=d6a6e7270aaa3282829141d476b56964b09108e1;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 abde0c299..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
@@ -1,40 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
 
 	<display-name>SLC Web Application</display-name>
 
+	<!-- SERVICE servlet -->
 	<servlet>
-		<servlet-name>slc-ws</servlet-name>
-		<servlet-class>
-			org.springframework.ws.transport.http.MessageDispatcherServlet
-		</servlet-class>
+		<servlet-name>slc-service</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>slc-ws</servlet-name>
-		<url-pattern>/slcService/*</url-pattern>
+		<servlet-name>slc-service</servlet-name>
+		<url-pattern>*.service</url-pattern>
 	</servlet-mapping>
 
+	<!-- WS servlet -->
 	<servlet>
-		<servlet-name>slc-web</servlet-name>
+		<servlet-name>slc-ws</servlet-name>
 		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
+			org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>slc-web</servlet-name>
-		<url-pattern>*.web</url-pattern>
+		<servlet-name>slc-ws</servlet-name>
+		<url-pattern>/slcService/*</url-pattern>
 	</servlet-mapping>
 
+	<!-- XSLT servlet -->
 	<servlet>
 		<servlet-name>xslt</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
@@ -42,11 +39,10 @@
 		<url-pattern>*.xslt</url-pattern>
 	</servlet-mapping>
 
+	<!-- DOC servlet -->
 	<servlet>
 		<servlet-name>doc</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 	</servlet>
 
 	<servlet-mapping>
@@ -58,41 +54,69 @@
 		<url-pattern>*.pdf</url-pattern>
 	</servlet-mapping>
 
+	<!-- General -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>/WEB-INF/applicationContext.xml</param-value>
 	</context-param>
 
 	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
+		<display-name>Spring Context</display-name>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
-	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.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>
+		<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
+	</resource-env-ref>
 
 	<!-- Log4j configContext loader config -->
 	<listener>
-		<listener-class>
-			org.springframework.web.util.Log4jConfigListener
-		</listener-class>
+		<display-name>Log4j</display-name>
+		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 	</listener>
 	<context-param>
 		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/log4j.properties</param-value>
+		<param-value>/WEB-INF/classes/log4j.properties</param-value>
 	</context-param>
 	<context-param>
 		<param-name>log4jRefreshInterval</param-name>
 		<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>