=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CalculatedDataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CalculatedDataElement.hbm.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CalculatedDataElement.hbm.xml	2011-04-12 13:17:54 +0000
@@ -10,7 +10,7 @@
     
     <key column="calculateddataelementid"/>
     
-    <property name="saved"/>
+    <property name="saved" not-null="true"/>
     
     <many-to-one name="expression" class="org.hisp.dhis.expression.Expression" 
       cascade="all" column="expressionid" foreign-key="fk_expression_expressionid"/>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2011-02-01 08:11:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2011-04-12 13:17:54 +0000
@@ -34,7 +34,7 @@
     
     <property name="description" type="text"/>
 
-    <property name="active"/>
+    <property name="active" not-null="true"/>
 
     <property name="type" column="valuetype" length="16" not-null="true"/>
     

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml	2011-04-03 11:02:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml	2011-04-12 13:17:54 +0000
@@ -29,7 +29,7 @@
         column="dataelementoperandid" foreign-key="fk_section_dataelementoperandid"/>
     </set>     
      
-   <property name="sortOrder" column="sortorder"/>
+   <property name="sortOrder" column="sortorder" not-null="true"/>
 
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/minmax/hibernate/MinMaxDataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/minmax/hibernate/MinMaxDataElement.hbm.xml	2009-12-23 07:35:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/minmax/hibernate/MinMaxDataElement.hbm.xml	2011-04-12 13:17:54 +0000
@@ -16,8 +16,8 @@
     <many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
         column="categoryoptioncomboid" foreign-key="fk_minmaxdataelement_categoryoptioncomboid" index="index_minmaxdataelement"/>
 
-    <property name="min" column="minvalue"/>
-    <property name="max" column="maxvalue"/>
-    <property name="generated"/>
+    <property name="min" column="minvalue" not-null="true"/>
+    <property name="max" column="maxvalue" not-null="true"/>
+    <property name="generated" not-null="true"/>
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2011-04-01 13:26:15 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2011-04-12 13:17:54 +0000
@@ -37,7 +37,7 @@
 		
     <property name="closedDate" column="closeddate" type="date"/>
 		
-    <property name="active"/>
+    <property name="active" not-null="true"/>
     
     <property name="comment" type="text"/>
     

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml	2010-01-19 21:48:28 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml	2011-04-12 13:17:54 +0000
@@ -14,7 +14,7 @@
     </property>
 
     <property name="description"/>
-    <property name="compulsory"/>
+    <property name="compulsory" not-null="true"/>
     
     <set name="organisationUnitGroups" table="orgunitgroupsetmembers">
       <key column="orgunitgroupsetid"/>