X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;fp=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Fweb.xml;h=812a662f855098df50376fe7e605d44c6bd0a608;hb=93b66f36bdb8042d2aac73b75dda76e65d8e7994;hp=d7105cf49436491dda23c0d5c47c5f3f4df65523;hpb=c21ebdcf2d9e1e3d0df737dc29b9763a078d84dc;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 d7105cf49..812a662f8 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>
@@ -152,12 +121,6 @@
 
     </servlet>
 
-    <!-- the queue browse servlet -->
-    <servlet>
-        <servlet-name>QueueBrowseServlet</servlet-name>
-        <servlet-class>org.apache.activemq.web.QueueBrowseServlet</servlet-class>
-    </servlet>
-
     <servlet-mapping>
         <servlet-name>AjaxServlet</servlet-name>
         <url-pattern>/amq/*</url-pattern>
@@ -167,11 +130,6 @@
         <servlet-name>MessageServlet</servlet-name>
         <url-pattern>/amqMessage/*</url-pattern>
     </servlet-mapping>
-    
-    <servlet-mapping>
-        <servlet-name>QueueBrowseServlet</servlet-name>
-        <url-pattern>/amqQueueBrowse/*</url-pattern>
-    </servlet-mapping>
 
     <filter>
       <filter-name>session</filter-name>
@@ -186,9 +144,4 @@
       <filter-name>session</filter-name>
       <url-pattern>/amqMessage/*</url-pattern>
     </filter-mapping>
-    <filter-mapping>
-      <filter-name>session</filter-name>
-      <url-pattern>/amqQueueBrowse/*</url-pattern>
-    </filter-mapping>
-	
 </web-app>