X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fweb.xml;h=0e1ad8909ce1f1825713dcd6ec5bff6eabbedacd;hb=8529821e6a306e93c7d2ae597cce92774626fc1b;hp=62d26b5a61f81bf1797b4db35685a6a15479a976;hpb=b072c117f63f2bfc3ccdf1614bfbe03877ea15c1;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
index 62d26b5a6..0e1ad8909 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -13,6 +13,7 @@
 			<param-name>contextClass</param-name>
 			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
 		</init-param>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<servlet-mapping>
@@ -20,22 +21,6 @@
 		<url-pattern>*.service</url-pattern>
 	</servlet-mapping>
 
-	<!-- WS servlet -->
-	<servlet>
-		<servlet-name>slc-ws</servlet-name>
-		<servlet-class>
-			org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextClass</param-name>
-			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-ws</servlet-name>
-		<url-pattern>/slcService/*</url-pattern>
-	</servlet-mapping>
-
 	<!-- XSLT servlet -->
 	<servlet>
 		<servlet-name>xslt</servlet-name>
@@ -85,13 +70,7 @@
 		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
 	</context-param>
 
-	<!-- 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 -->
+	<!-- Log4j configContext loader config
 	<listener>
 		<display-name>Log4j</display-name>
 		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
@@ -104,37 +83,24 @@
 		<param-name>log4jRefreshInterval</param-name>
 		<param-value>5000</param-value>
 	</context-param>
+ -->
 
-
-	<!-- Active MQ -->
-	<context-param>
+	<!--
+		Active MQ <context-param>
 		<param-name>org.apache.activemq.brokerURL</param-name>
-		<param-value>tcp://localhost:61616</param-value>
-	</context-param>
+		<param-value>vm://localhost</param-value> </context-param>
 
-	<context-param>
+		<context-param>
 		<param-name>org.apache.activemq.embeddedBroker</param-name>
-		<param-value>false</param-value>
-	</context-param>
-
-	<servlet>
+		<param-value>false</param-value> </context-param> <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>
+		<load-on-startup>1</load-on-startup> </servlet> <servlet-mapping>
 		<servlet-name>MessageListenerServlet</servlet-name>
-		<url-pattern>/amq/*</url-pattern>
-	</servlet-mapping>
-
-	<filter>
+		<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>
+		</filter> <filter-mapping> <filter-name>session</filter-name>
+		<url-pattern>/amq/*</url-pattern> </filter-mapping>
+	-->
 </web-app>