dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08217
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1955: Removed pfd print servlet
------------------------------------------------------------
revno: 1955
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-10-25 19:13:43 +0200
message:
Removed pfd print servlet
removed:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml
modified:
dhis-2/dhis-web/dhis-web-mapping/pom.xml
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml
dhis-2/dhis-web/dhis-web-portal/pom.xml
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/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-08-20 09:13:09 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-10-25 17:13:43 +0000
@@ -54,24 +54,6 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
-
- <!-- Mapfish print module -->
-
- <dependency>
- <groupId>org.mapfish.print</groupId>
- <artifactId>print-lib</artifactId>
- <version>1.2-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- JSON -->
@@ -95,15 +77,6 @@
</dependencies>
- <repositories>
-
- <repository>
- <id>org.mapfish</id>
- <url>http://dev.mapfish.org/maven/repository</url>
- </repository>
-
- </repositories>
-
<properties>
<rootDir>../../</rootDir>
</properties>
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml 2010-02-18 17:01:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml 2010-10-25 17:13:43 +0000
@@ -58,17 +58,4 @@
<listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class>
</listener>
- <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>
=== removed 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-03-09 15:29:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/config.yaml 1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
- #===========================================================================
-# allowed DPIs
-#===========================================================================
-dpis:
- - 254
- - 190
- - 127
- - 56
-
-#===========================================================================
-# the allowed scales
-#===========================================================================
-scales:
- - 25000
- - 50000
- - 100000
- - 200000
- - 500000
- - 1000000
- - 2000000
- - 4000000
- - 8000000
- - 16000000
- - 32000000
- - 64000000
-
-#===========================================================================
-# the list of allowed hosts
-#===========================================================================
-hosts:
- - !localMatch
- dummy: true
- - !ipMatch
- ip: www.camptocamp.org
- - !dnsMatch
- host: labs.metacarta.com
- port: 80
- - !dnsMatch
- host: demo.mapfish.org
- port: 80
-
-layouts:
- #===========================================================================
- A4 portrait:
- #===========================================================================
- mainPage:
- rotation: true
- pageSize: A4
- header:
- height: 50
- items:
- - !text
- font: Helvetica
- fontSize: 30
- align: right
- text: '${mapTitle}'
- items:
- - !map
- spacingAfter: 30
- width: 440
- height: 483
- - !text
- text: '${comment}'
- spacingAfter: 30
- footer:
- height: 30
- items:
- - !columns
- items:
- - !text
- align: right
- text: 'Page ${pageNum}'
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-10-22 09:23:05 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2010-10-25 17:13:43 +0000
@@ -68,8 +68,7 @@
<artifactId>dhis-web-maintenance-settings</artifactId>
<version>${project.version}</version>
<type>war</type>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-maintenance-patient</artifactId>
@@ -91,42 +90,36 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
-
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-validationrule</artifactId>
<version>${project.version}</version>
<type>war</type>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-dataentry</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
-
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-reporting</artifactId>
<version>${project.version}</version>
<type>war</type>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-dashboard-integration</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
-
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-mapping</artifactId>
<version>${project.version}</version>
<type>war</type>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-excel-reporting</artifactId>
@@ -146,48 +139,15 @@
<type>war</type>
</dependency>
-
-
- <!-- India modules -->
-
-<!--
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-dashboard</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-reports-national</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
--->
-<!--
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-dataentry-national</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-validationrule-local-in</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency> -->
-
-
<!-- Vietnam modules -->
- <!--
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-gis</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
- -->
+ -->
<!-- South Africa modules -->
<!--
=== 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-08-25 09:59:25 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2010-10-25 17:13:43 +0000
@@ -61,20 +61,8 @@
<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>
- <load-on-startup>1</load-on-startup>
- </servlet>
-<!-- For the dhis-web-api module -->
+ <!-- For the dhis-web-api module -->
<servlet>
<servlet-name>web-api</servlet-name>
@@ -91,16 +79,10 @@
</servlet>
<servlet-mapping>
- <servlet-name>mapfish.print</servlet-name>
- <url-pattern>/pdf/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>web-api</servlet-name>
<url-pattern>/api/*</url-pattern>
</servlet-mapping>
-
<error-page>
<exception-type>java.lang.Throwable</exception-type>
<location>/error.html</location>
