dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1599
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-03-09 16:29:22 +0100
message:
  (GIS) PDF printing service now works with the portal. Printing servlet mapping hardcoded in portal web.xml (should be revised after release).
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml	2010-02-18 17:01:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml	2010-03-09 15:29:22 +0000
@@ -68,9 +68,5 @@
           - !columns
             items:
               - !text
-                backgroundColor: #FF0000
-                align: left
-                text: Copyright Camptocamp SA
-              - !text
                 align: right
-                text: 'Page ${pageNum}'
+                text: 'Page ${pageNum}'
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2010-01-28 15:23:28 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml	2010-03-09 15:29:22 +0000
@@ -57,5 +57,20 @@
   <listener>
     <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
   </listener>
+  
+  <!-- For the dhis-web-mapping module (pdf printing service) -->
+  
+  <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>/pdf/*</url-pattern>
+  </servlet-mapping>
 
 </web-app>