=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2011-01-13 15:44:09 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,59 +5,56 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.chart.Chart" table="chart">
-    
+
     <id name="id" column="chartid">
-      <generator class="native"/>
+      <generator class="native" />
     </id>
-    
-    <property name="title" not-null="true" unique="true"/>
-    
-    <property name="type"/>
-    
-    <property name="size"/>
-    
-    <property name="dimension"/>
-    
-    <property name="hideLegend"/>
-    
-    <property name="verticalLabels"/>
-    
-    <property name="horizontalPlotOrientation"/>
-    
-    <property name="regression"/>
-    
+
+    <property name="title" not-null="true" unique="true" />
+
+    <property name="type" />
+
+    <property name="size" />
+
+    <property name="dimension" />
+
+    <property name="hideLegend" />
+
+    <property name="verticalLabels" />
+
+    <property name="horizontalPlotOrientation" />
+
+    <property name="regression" />
+
     <list name="indicators" table="chart_indicators">
-      <key column="chartid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="indicatorid"
-        class="org.hisp.dhis.indicator.Indicator"/>
+      <key column="chartid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="indicatorid" class="org.hisp.dhis.indicator.Indicator" />
     </list>
-    
+
     <list name="periods" table="chart_periods">
-      <key column="chartid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="periodid"
-        class="org.hisp.dhis.period.Period"/>
+      <key column="chartid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="periodid" class="org.hisp.dhis.period.Period" />
     </list>
-    
+
     <list name="organisationUnits" table="chart_organisationunits">
-      <key column="chartid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="organisationunitid"
-        class="org.hisp.dhis.organisationunit.OrganisationUnit"/>
+      <key column="chartid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="organisationunitid" class="org.hisp.dhis.organisationunit.OrganisationUnit" />
     </list>
 
     <component name="relatives">
-      <property name="reportingMonth"/>
-      <property name="monthsThisYear"/>
-      <property name="quartersThisYear"/>
-      <property name="thisYear"/>
-      <property name="monthsLastYear"/>
-      <property name="quartersLastYear"/>
-      <property name="lastYear"/>
+      <property name="reportingMonth" />
+      <property name="monthsThisYear" />
+      <property name="quartersThisYear" />
+      <property name="thisYear" />
+      <property name="monthsLastYear" />
+      <property name="quartersLastYear" />
+      <property name="lastYear" />
     </component>
-    
-    <property name="userOrganisationUnit"/>
-    
+
+    <property name="userOrganisationUnit" />
+
   </class>
-</hibernate-mapping>  
\ No newline at end of file
+</hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml	2011-01-21 16:22:50 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,49 +5,44 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.dashboard.DashboardContent" table="dashboardcontent">
-  
+
     <id name="id" column="dashboardcontentid">
       <generator class="foreign">
         <param name="property">user</param>
       </generator>
     </id>
 
-    <one-to-one name="user" class="org.hisp.dhis.user.User" constrained="true"/>
-        
+    <one-to-one name="user" class="org.hisp.dhis.user.User" constrained="true" />
+
     <list name="reports" table="dashboardcontent_reports">
-      <key column="userid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="reportid"
-        class="org.hisp.dhis.report.Report"/>
+      <key column="userid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="reportid" class="org.hisp.dhis.report.Report" />
     </list>
-        
+
     <list name="olapUrls" table="dashboardcontent_olapurls">
-      <key column="userid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="olapurlid"
-        class="org.hisp.dhis.olap.OlapURL"/>
+      <key column="userid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="olapurlid" class="org.hisp.dhis.olap.OlapURL" />
     </list>
-    
+
     <list name="documents" table="dashboardcontent_documents">
-      <key column="userid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="documentid"
-        class="org.hisp.dhis.document.Document"/>
+      <key column="userid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="documentid" class="org.hisp.dhis.document.Document" />
     </list>
-    
+
     <list name="reportTables" table="dashboardcontent_reporttables">
-      <key column="userid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="reporttableid"
-        class="org.hisp.dhis.reporttable.ReportTable"/>
+      <key column="userid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="reporttableid" class="org.hisp.dhis.reporttable.ReportTable" />
     </list>
-    
+
     <list name="mapViews" table="dashboardcontent_mapviews">
-      <key column="userid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="mapviewid"
-        class="org.hisp.dhis.mapping.MapView"/>
+      <key column="userid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="mapviewid" class="org.hisp.dhis.mapping.MapView" />
     </list>
-    
+
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml	2010-09-20 08:49:55 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,18 +5,18 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.document.Document" table="document">
-    
+
     <id name="id" column="documentid">
-      <generator class="native"/>
+      <generator class="native" />
     </id>
-    
-    <property name="name" not-null="true" unique="true" length="160"/>
-
-    <property name="url" not-null="true" type="text"/>
-
-    <property name="external"/>
-
-	<property name="contentType"/>
-    
+
+    <property name="name" not-null="true" unique="true" length="160" />
+
+    <property name="url" not-null="true" type="text" />
+
+    <property name="external" not-null="true" />
+
+    <property name="contentType" />
+
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/olap/hibernate/OlapURL.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,16 +5,16 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.olap.OlapURL" table="olapurl">
-    
+
     <id name="id" column="olapurlid">
-      <generator class="native"/>
+      <generator class="native" />
     </id>
-    
+
     <property name="name">
-      <column name="name" not-null="true" unique="true" length="160"/>
+      <column name="name" not-null="true" unique="true" length="160" />
     </property>
 
-    <property name="url" type="text"/>
+    <property name="url" type="text" />
 
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml	2011-02-22 23:05:45 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,19 +5,19 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.report.Report" table="report">
-    
+
     <id name="id" column="reportid">
-      <generator class="native"/>
+      <generator class="native" />
     </id>
-    
+
     <property name="name">
-      <column name="name" not-null="true" unique="true" length="160"/>
+      <column name="name" not-null="true" unique="true" length="160" />
     </property>
 
-	<property name="designContent" type="text"/>
-        
-    <many-to-one name="reportTable" class="org.hisp.dhis.reporttable.ReportTable"
-      column="reporttableid" foreign-key="fk_report_reporttableid"/>
-    
+    <property name="designContent" type="text" />
+
+    <many-to-one name="reportTable" class="org.hisp.dhis.reporttable.ReportTable" column="reporttableid"
+      foreign-key="fk_report_reporttableid" />
+
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml	2011-03-29 20:06:47 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml	2011-04-12 13:30:10 +0000
@@ -5,81 +5,76 @@
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.reporttable.ReportTable" table="reporttable">
-    
+
     <id name="id" column="reporttableid">
-      <generator class="native"/>
+      <generator class="native" />
     </id>
-    
+
     <property name="name">
-      <column name="name" not-null="true" unique="true"/>
+      <column name="name" not-null="true" unique="true" />
     </property>
-    
-    <property name="regression"/>
-    
+
+    <property name="regression" />
+
     <list name="dataElements" table="reporttable_dataelements">
-      <key column="reporttableid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="dataelementid"
-        class="org.hisp.dhis.dataelement.DataElement"/>
+      <key column="reporttableid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="dataelementid" class="org.hisp.dhis.dataelement.DataElement" />
     </list>
 
     <list name="indicators" table="reporttable_indicators">
-      <key column="reporttableid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="indicatorid"
-        class="org.hisp.dhis.indicator.Indicator"/>
+      <key column="reporttableid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="indicatorid" class="org.hisp.dhis.indicator.Indicator" />
     </list>
 
     <list name="dataSets" table="reporttable_datasets">
-      <key column="reporttableid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="datasetid"
-        class="org.hisp.dhis.dataset.DataSet"/>
+      <key column="reporttableid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="datasetid" class="org.hisp.dhis.dataset.DataSet" />
     </list>
-    
-    <many-to-one name="categoryCombo" class="org.hisp.dhis.dataelement.DataElementCategoryCombo"
-      column="categorycomboid" foreign-key="fk_reporttable_categorycombo"/>
-	
+
+    <many-to-one name="categoryCombo" class="org.hisp.dhis.dataelement.DataElementCategoryCombo" column="categorycomboid"
+      foreign-key="fk_reporttable_categorycombo" />
+
     <list name="periods" table="reporttable_periods">
-      <key column="reporttableid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="periodid"
-        class="org.hisp.dhis.period.Period"/>
+      <key column="reporttableid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="periodid" class="org.hisp.dhis.period.Period" />
     </list>
 
     <list name="units" table="reporttable_organisationunits">
-      <key column="reporttableid"/>
-      <list-index column="sort_order" base="0"/>
-      <many-to-many column="organisationunitid"
-        class="org.hisp.dhis.organisationunit.OrganisationUnit"/>
+      <key column="reporttableid" />
+      <list-index column="sort_order" base="0" />
+      <many-to-many column="organisationunitid" class="org.hisp.dhis.organisationunit.OrganisationUnit" />
     </list>
 
-    <property name="doIndicators"/>
-    
-    <property name="doPeriods"/>
-    
-    <property name="doUnits"/>
-    
+    <property name="doIndicators" />
+
+    <property name="doPeriods" />
+
+    <property name="doUnits" />
+
     <component name="relatives">
-      <property name="reportingMonth"/>
-      <property name="monthsThisYear"/>
-      <property name="quartersThisYear"/>
-      <property name="thisYear"/>
-      <property name="monthsLastYear"/>
-      <property name="quartersLastYear"/>
-      <property name="lastYear"/>
+      <property name="reportingMonth" />
+      <property name="monthsThisYear" />
+      <property name="quartersThisYear" />
+      <property name="thisYear" />
+      <property name="monthsLastYear" />
+      <property name="quartersLastYear" />
+      <property name="lastYear" />
     </component>
-    
+
     <component name="reportParams">
-      <property name="paramReportingMonth"/>
-      <property name="paramGrandParentOrganisationUnit"/>
-      <property name="paramParentOrganisationUnit"/>
-      <property name="paramOrganisationUnit"/>
+      <property name="paramReportingMonth" />
+      <property name="paramGrandParentOrganisationUnit" />
+      <property name="paramParentOrganisationUnit" />
+      <property name="paramOrganisationUnit" />
     </component>
-    
-    <property name="sortOrder"/>
-    
-    <property name="topLimit"/>
-    
+
+    <property name="sortOrder" />
+
+    <property name="topLimit" />
+
   </class>
 </hibernate-mapping>