=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl 2015-09-21 12:26:37 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl 2015-09-21 12:31:10 +0000
@@ -42,7 +42,7 @@
- Polygon
+ POLYGON
[[
@@ -55,7 +55,7 @@
- MultiPolygon
+ MULTI_POLYGON
[
@@ -64,7 +64,7 @@
- Point
+ POINT
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java 2015-09-17 04:29:29 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java 2015-09-21 12:31:10 +0000
@@ -141,7 +141,6 @@
// -------------------------------------------------------------------------
@Test
- @Ignore
public void testImportGml()
throws Exception
{