diff flys-client/src/main/webapp/WEB-INF/web.xml @ 2502:328aa273ef3b

Call MapPrinter directly and not via the MapFish Print servlet. flys-client/trunk@4347 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 04 May 2012 15:19:30 +0000
parents 7e077899e259
children 427df4e81af0
line wrap: on
line diff
--- a/flys-client/src/main/webapp/WEB-INF/web.xml	Thu May 03 08:57:35 2012 +0000
+++ b/flys-client/src/main/webapp/WEB-INF/web.xml	Fri May 04 15:19:30 2012 +0000
@@ -238,6 +238,12 @@
     <servlet-class>de.intevation.flys.client.server.ChartOutputServiceImpl</servlet-class>
   </servlet>
 
+  <servlet-mapping>
+    <servlet-name>ChartOutputService</servlet-name>
+    <url-pattern>/flys/chart</url-pattern>
+  </servlet-mapping>
+
+  <!-- MapFish Print -->
   <servlet>
     <servlet-name>MapOutputService</servlet-name>
     <servlet-class>de.intevation.flys.client.server.MapOutputServiceImpl</servlet-class>
@@ -248,11 +254,22 @@
     <url-pattern>/flys/map</url-pattern>
   </servlet-mapping>
 
+  <!-- Servlet to bridge between MapFish Print and FLYS3 -->
+  <servlet>
+    <servlet-name>MapPrintService</servlet-name>
+    <servlet-class>de.intevation.flys.client.server.MapPrintServiceImpl</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>WEB-INF/config.yaml</param-value>
+    </init-param>
+  </servlet>
+
   <servlet-mapping>
-    <servlet-name>ChartOutputService</servlet-name>
-    <url-pattern>/flys/chart</url-pattern>
+    <servlet-name>MapPrintService</servlet-name>
+    <url-pattern>/flys/map-print</url-pattern>
   </servlet-mapping>
 
+
   <servlet>
     <servlet-name>FixingsKMChartService</servlet-name>
     <servlet-class>de.intevation.flys.client.server.FixingsKMChartServiceImpl</servlet-class>
@@ -423,20 +440,6 @@
     <url-pattern>/flys/fileupload</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>mapfish.print</servlet-name>
-    <servlet-class>org.mapfish.print.servlet.MapPrinterServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>config.yaml</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>mapfish.print</servlet-name>
-    <url-pattern>/flys/map-print</url-pattern>
-  </servlet-mapping>
-
   <!-- Default page to serve -->
   <welcome-file-list>
     <welcome-file>FLYS.html</welcome-file>

http://dive4elements.wald.intevation.org