dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #00410
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 130: Update Gis using batik API
------------------------------------------------------------
revno: 130
committer: Tran Thanh Tri <Tran Thanh Tri@compaq>
branch nick: trunk
timestamp: Mon 2009-03-30 13:13:54 +0700
message:
Update Gis using batik API
removed:
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/batik-rasterizer.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-anim.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-awt-util.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-bridge.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-codec.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-css.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-dom.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-ext.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-extension.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gui-util.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gvt.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-parser.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-script.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svg-dom.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svggen.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-swing.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-transcoder.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-util.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-xml.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/js.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xalan-2.6.0.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xerces_2_5_0.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis-ext.jar
dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis.jar
modified:
dhis-2/dhis-web/dhis-web-gis/pom.xml
dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/dataanlysis/FillMapByIndicatorAction.java
dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java
dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportImageAction.java
dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/FileFeatureStore.java
dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/FileCopy.java
=== modified file 'dhis-2/dhis-web/dhis-web-gis/pom.xml'
--- dhis-2/dhis-web/dhis-web-gis/pom.xml 2009-03-14 12:09:22 +0000
+++ dhis-2/dhis-web/dhis-web-gis/pom.xml 2009-03-30 06:13:54 +0000
@@ -73,284 +73,95 @@
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis-ext</artifactId>
- <version>1.3.04</version>
- </dependency>
--->
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
- </dependency>
- -->
+
<!-- Batik -->
- <!--
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik</artifactId>
- <version>1.5</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-1.5-fop</artifactId>
- <version>0.20-5</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-awt-util</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-bridge</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-css</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-dom</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-ext</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-extension</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-gui-util</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-gvt</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-parser</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-rasterizer</artifactId>
- <version>ext</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-rasterizer-ext</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-script</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-svg-dom</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-svggen</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-svgpp</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-util</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-xml</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>batik</groupId>
- <artifactId>batik-transcoder</artifactId>
- <version>1.6-1</version>
- <exclusions>
- <exclusion>
- <groupId>crimson</groupId>
- <artifactId>crimson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-dom</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-script</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-anim</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis-ext</artifactId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-codec</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-parser</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-xml</artifactId>
+ <version>1.7</version>
+ </dependency>
</dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/dataanlysis/FillMapByIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/dataanlysis/FillMapByIndicatorAction.java 2009-03-11 15:37:22 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/dataanlysis/FillMapByIndicatorAction.java 2009-03-30 06:13:54 +0000
@@ -284,7 +284,8 @@
Date startdate = format.parseDate(startDate);
- Date enddate = format.parseDate(endDate);
+ Date enddate = format.parseDate(endDate);
+
for (OrganisationUnit org : organisationUnit.getChildren()) {
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java 2009-03-11 15:37:22 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java 2009-03-30 06:13:54 +0000
@@ -50,6 +50,7 @@
import org.hisp.dhis.gis.Legend;
import org.hisp.dhis.gis.action.configuration.GISConfigurationManagerService;
import org.hisp.dhis.gis.state.SelectionManager;
+import org.hisp.dhis.gis.util.SVGUtils;
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -137,18 +138,22 @@
{
String svg = directory.getAbsolutePath() + File.separator + "legend.svg";
-
- String jarpath = "\"" + directory.getParent() + File.separator + "batik-1.7" + File.separator
- + "batik-rasterizer.jar\" ";
-
- String jarrun = "java -jar " + jarpath + " -w 100 -h " + legends.size() * 100 + " -q 0.9999 -m image/png "
- + "\"" + svg + "\"";
-
- Process pro = Runtime.getRuntime().exec( jarrun );
-
- pro.waitFor();
-
- pro.destroy();
+
+ String output = directory.getAbsolutePath() + File.separator + "legend.png";
+
+ SVGUtils.convertSVG2PNG( svg, output, 100, legends.size() * 100 );
+
+// String jarpath = "\"" + directory.getParent() + File.separator + "batik-1.7" + File.separator
+// + "batik-rasterizer.jar\" ";
+//
+// String jarrun = "java -jar " + jarpath + " -w 100 -h " + legends.size() * 100 + " -q 0.9999 -m image/png "
+// + "\"" + svg + "\"";
+//
+// Process pro = Runtime.getRuntime().exec( jarrun );
+//
+// pro.waitFor();
+//
+// pro.destroy();
File result = new File( directory, "legend.png" );
@@ -190,19 +195,23 @@
File directory = gisConfigurationManagerService.getGISTempDirectory();
String svg = directory.getAbsolutePath() + File.separator + "temp.svg";
+
+ String outputPath = directory.getAbsolutePath() + File.separator + "temp.png";
File output = new File( directory, "ouput.xls" );
-
- String jarpath = "\"" + directory.getParent() + File.separator + "batik-1.7" + File.separator
- + "batik-rasterizer.jar\" ";
-
- String jarrun = "java -jar " + jarpath + " -w 1024 -h 1024 -q 0.9999 -m image/png " + "\"" + svg + "\"";
-
- Process pro = Runtime.getRuntime().exec( jarrun );
-
- pro.waitFor();
-
- pro.destroy();
+
+ SVGUtils.convertSVG2PNG( svg, outputPath, 1000, 1000);
+
+ //String jarpath = "\"" + directory.getParent() + File.separator + "batik-1.7" + File.separator
+ // + "batik-rasterizer.jar\" ";
+
+ //String jarrun = "java -jar " + jarpath + " -w 1024 -h 1024 -q 0.9999 -m image/png " + "\"" + svg + "\"";
+
+ // Process pro = Runtime.getRuntime().exec( jarrun );
+
+ //pro.waitFor();
+
+ //pro.destroy();
// Workbook templateWorkbook = Workbook.c;
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportImageAction.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportImageAction.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportImageAction.java 2009-03-30 06:13:54 +0000
@@ -34,6 +34,7 @@
import java.util.Date;
import org.hisp.dhis.gis.action.configuration.GISConfigurationManagerService;
+import org.hisp.dhis.gis.util.SVGUtils;
import com.opensymphony.xwork.Action;
@@ -101,24 +102,28 @@
File directory = gisConfigurationManagerService.getGISTempDirectory();
String svg = directory.getAbsolutePath() + File.separator + "temp.svg";
-
- String jarpath = "\"" + gisConfigurationManagerService.getGISDirectory() + File.separator + "batik-1.7"
- + File.separator + "batik-rasterizer.jar\" ";
-
- String jarrun = "java -jar " + jarpath + " -w 1024 -h 1024 -q 0.9999 -m image/jpeg " + "\"" + svg + "\"";
-
- Process pro = Runtime.getRuntime().exec( jarrun );
-
- pro.waitFor();
-
- pro.destroy();
-
- File outputXLSStream = new File( directory.getAbsolutePath() + File.separator + "temp.jpg" );
+
+ String outputPath = directory.getAbsolutePath() + File.separator + "temp.png";
+
+ SVGUtils.convertSVG2PNG( svg, outputPath, 1024, 1024);
+
+// String jarpath = "\"" + gisConfigurationManagerService.getGISDirectory() + File.separator + "batik-1.7"
+// + File.separator + "batik-rasterizer.jar\" ";
+//
+// String jarrun = "java -jar " + jarpath + " -w 1024 -h 1024 -q 0.9999 -m image/jpeg " + "\"" + svg + "\"";
+//
+// Process pro = Runtime.getRuntime().exec( jarrun );
+//
+// pro.waitFor();
+//
+// pro.destroy();
+
+ File outputXLSStream = new File( directory.getAbsolutePath() + File.separator + "temp.png" );
inputStream = new BufferedInputStream( new FileInputStream( outputXLSStream ) );
outputImage = mapFileName.replace( ".svg", "" ) + "_" + new Date().getDay() + new Date().getMonth()
- + new Date().getYear() + ".jpg";
+ + new Date().getYear() + ".png";
outputXLSStream.deleteOnExit();
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/FileFeatureStore.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/FileFeatureStore.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/FileFeatureStore.java 2009-03-30 06:13:54 +0000
@@ -277,7 +277,7 @@
String[] a_color_value = color_value.split( "-" );
newColor = a_color_value[0];
- newColor = "fill=\"" + newColor + "\"";
+ newColor = " fill=\"" + newColor + "\"";
newText = ":" + a_color_value[1] + "</text>";
=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/FileCopy.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/FileCopy.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/FileCopy.java 2009-03-30 06:13:54 +0000
@@ -37,7 +37,7 @@
/**
* @author Tran Thanh Tri
- * @version $Id: Feature.java 28-04-2008 16:06:00 $
+ * @version $Id: FileCopy.java 28-04-2008 16:06:00 $
*/
public class FileCopy
{
=== removed directory 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7'
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/batik-rasterizer.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/batik-rasterizer.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/batik-rasterizer.jar 1970-01-01 00:00:00 +0000 differ
=== removed directory 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib'
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-anim.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-anim.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-anim.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-awt-util.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-awt-util.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-awt-util.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-bridge.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-bridge.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-bridge.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-codec.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-codec.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-codec.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-css.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-css.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-css.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-dom.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-dom.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-dom.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-ext.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-ext.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-ext.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-extension.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-extension.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-extension.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gui-util.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gui-util.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gui-util.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gvt.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gvt.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-gvt.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-parser.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-parser.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-parser.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-script.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-script.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-script.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svg-dom.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svg-dom.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svg-dom.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svggen.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svggen.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-svggen.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-swing.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-swing.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-swing.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-transcoder.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-transcoder.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-transcoder.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-util.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-util.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-util.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-xml.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-xml.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/batik-xml.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/js.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/js.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/js.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xalan-2.6.0.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xalan-2.6.0.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xalan-2.6.0.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xerces_2_5_0.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xerces_2_5_0.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xerces_2_5_0.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis-ext.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis-ext.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis-ext.jar 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis.jar'
Binary files dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis.jar 2009-03-03 16:46:36 +0000 and dhis-2/dhis-web/dhis-web-gis/src/main/webapp/dhis-web-gis/batik-1.7/lib/xml-apis.jar 1970-01-01 00:00:00 +0000 differ
--
Trunk
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.
Follow ups
