=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.catalog.Catalog" table="catalog">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.catalog.CatalogDataValue" table="catalogdatavalue">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.catalog.CatalogType" table="catalogtype">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.catalog.CatalogTypeAttribute" table="catalogtypeattribute">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.catalog.CatalogTypeAttributeOption" table="catalogtypeattributeoption">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml	2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDetails.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.inventory.EquipmentDetails" table="equipmentdetails">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml	2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.inventory.EquipmentInstance" table="equipmentinstance">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml	2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentWorkingStatus.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
 	<class name="org.hisp.dhis.coldchain.inventory.EquipmentWorkingStatus" table="equipmentstatusupdates">
 	

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml	2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.inventory.InventoryType" table="inventorytype">
     <id name="id" column="inventorytypeid">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml	2012-04-17 10:58:04 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.inventory.InventoryTypeAttribute" table="inventorytypeattribute">

=== modified file 'local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml	2012-04-16 11:29:53 +0000
+++ local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.coldchain.inventory.InventoryTypeAttributeOption" table="inventorytypeattributeoption">

=== modified file 'local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/org/hisp/dhis/config/hibernate/ConfigIn.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/org/hisp/dhis/config/hibernate/ConfigIn.hbm.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-in-services/dhis-in-service-configuration/src/main/resources/org/hisp/dhis/config/hibernate/ConfigIn.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.config.Configuration_IN" table="config_in">

=== modified file 'local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/org/hisp/dhis/dataentrystatus/hibernate/DataEntryStatus.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/org/hisp/dhis/dataentrystatus/hibernate/DataEntryStatus.hbm.xml	2011-06-15 05:50:55 +0000
+++ local/in/dhis-in-services/dhis-in-service-dataentrystatus/src/main/resources/org/hisp/dhis/dataentrystatus/hibernate/DataEntryStatus.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.dataentrystatus.DataEntryStatus" table="dataentrystatus">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/Employee.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/Employee.hbm.xml	2010-11-15 08:26:40 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/Employee.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.Employee" table="employee">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListDataElementMap.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListDataElementMap.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListDataElementMap.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListElement.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListElement.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListElement.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.LineListElement" table="linelistelement">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListGroup.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListGroup.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListGroup.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.LineListGroup" table="linelistgroup">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListOption.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListOption.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListOption.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.LineListOption" table="linelistoption">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListValidationRule.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListValidationRule.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/hibernate/LineListValidationRule.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.LineListValidationRule" table="linelistvalidationrule">
     <id column="llvalidationid" name="id">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/LineListDataElementMapping.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/LineListDataElementMapping.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/linelistdataelementmapping/hibernate/LineListDataElementMapping.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+ 
 <hibernate-mapping>
   <class name="org.hisp.dhis.linelisting.linelistdataelementmapping.LineListDataElementMapping" table="lldataelementmapping">
     <id column="lldataelementmapid" name="id">

=== modified file 'local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/llaggregation/hibernate/LinelistAggregation.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/llaggregation/hibernate/LinelistAggregation.hbm.xml	2010-10-20 06:14:25 +0000
+++ local/in/dhis-in-services/dhis-in-service-linelisting/src/main/resources/org/hisp/dhis/linelisting/llaggregation/hibernate/LinelistAggregation.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC 
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
     <class name="org.hisp.dhis.linelisting.llaggregation.LinelistAggregationMapping" table="llaggregation">

=== modified file 'local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/org/hisp/dhis/reports/hibernate/Reports.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/org/hisp/dhis/reports/hibernate/Reports.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/org/hisp/dhis/reports/hibernate/Reports.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.reports.Report_in" table="reportin">

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTarget.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTarget.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTarget.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetDataValue.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetDataValue.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetDataValue.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.detargetdatavalue.DeTargetDataValue" table="detargetdatavalue">

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetMember.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetMember.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/detarget/hibernate/DeTargetMember.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/Survey.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/Survey.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/Survey.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/SurveyDataValue.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/SurveyDataValue.hbm.xml	2011-04-28 13:07:21 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/SurveyDataValue.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.surveydatavalue.SurveyDataValue" table="surveydatavalue">

=== modified file 'local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/target/hibernate/TargetMapping.hbm.xml'
--- local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/target/hibernate/TargetMapping.hbm.xml	2010-06-16 11:17:12 +0000
+++ local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/target/hibernate/TargetMapping.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   

=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/ReceiveSMS.hbm.xml'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/ReceiveSMS.hbm.xml	2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/ReceiveSMS.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
 	<class name="org.hisp.dhis.mobile.api.ReceiveSMS" table="receivesms">

=== modified file 'local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/SendSMS.hbm.xml'
--- local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/SendSMS.hbm.xml	2011-04-15 11:41:30 +0000
+++ local/in/dhis-mobile/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/hibernate/SendSMS.hbm.xml	2012-04-17 11:59:19 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.mobile.api.SendSMS" table="sendsms">

=== modified file 'local/in/dhis-web-coldchain/pom.xml'
--- local/in/dhis-web-coldchain/pom.xml	2012-04-17 10:41:26 +0000
+++ local/in/dhis-web-coldchain/pom.xml	2012-04-17 11:59:19 +0000
@@ -29,22 +29,7 @@
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-service-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-service-patient</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-linelisting</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-dbmanager</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
@@ -68,31 +53,12 @@
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-support-system</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.hisp.dhis</groupId>
 			<artifactId>dhis-in-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-survey</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-configuration</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-reports</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hisp.dhis</groupId>
-			<artifactId>dhis-in-service-dataentrystatus</artifactId>
-			<version>${project.version}</version>
-		</dependency>
         <dependency>
             <groupId>org.hisp.dhis</groupId>
             <artifactId>dhis-in-service-coldchain</artifactId>
@@ -100,49 +66,6 @@
         </dependency>
 			
 		<!-- Other -->
-		<!--	     
-		<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-orm</artifactId>
-		</dependency>
-		
-		<dependency>
-		<groupId>junit</groupId>
-		<artifactId>junit</artifactId>
-		</dependency>
-		-->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>opensymphony</groupId>
-			<artifactId>quartz</artifactId>
-			<version>1.6.3</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart-experimental</artifactId>
-			<version>1.0.3</version>
-		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jcommon</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.lowagie</groupId>
-			<artifactId>itext</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>