=== removed file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRule.hbm.xml	2015-03-13 08:24:36 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRule.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-<?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"
-  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-  >
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.programrule.ProgramRule" table="programrule">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="programruleid">
-      <generator class="native" />
-    </id>
-
-    &identifiableProperties;
-
-    <property name="name" column="name" length="230" />
-    
-    <property name="description" />
-
-    <many-to-one name="program" class="org.hisp.dhis.program.Program" 
-       	column="programid" foreign-key="fk_programrule_program" />
-    
-	<many-to-one name="programStage" class="org.hisp.dhis.program.ProgramStage" 
-		column="programstageid" foreign-key="fk_programrule_programstage" />
-
-    <set name="programRuleActions" cascade="all">
-		<key column="programruleid" />
-		<one-to-many class="org.hisp.dhis.programrule.ProgramRuleAction" />
-	</set>
-
-    <property name="condition" />
-   
-    <property name="priority" />
-   
-  </class>
-</hibernate-mapping>

=== removed file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleAction.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleAction.hbm.xml	2015-03-13 08:24:36 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleAction.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-<?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"
-  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-  >
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.programrule.ProgramRuleAction" table="programruleaction">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="programruleactionid">
-      <generator class="native" />
-    </id>
-
-    &identifiableProperties;
-
-    <property name="name" column="name" length="230" />
-
-	<many-to-one name="programRule" class="org.hisp.dhis.programrule.ProgramRule" 
-		column="programruleid" foreign-key="fk_programruleaction_programrule" />
-
-    <property name="programRuleActionType" column="actiontype">
-        <type name="org.hibernate.type.EnumType">
-            <param name="enumClass">org.hisp.dhis.programrule.ProgramRuleActionType</param>
-            <param name="type">12</param>
-        </type>
-    </property>
-
-    <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" 
-        column="dataelementid" foreign-key="fk_programruleaction_dataelement" />
-
-    <property name="location" />
-   
-    <property name="content" />
-    
-    <property name="data" />
-  </class>
-</hibernate-mapping>

=== removed file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleVariable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleVariable.hbm.xml	2015-03-13 08:24:36 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/ProgramRuleVariable.hbm.xml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-<?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"
-  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-  >
-
-<hibernate-mapping>
-  <class name="org.hisp.dhis.programrule.ProgramRuleVariable" table="programrulevariable">
-
-    <cache usage="read-write" />
-
-    <id name="id" column="programrulevariableid">
-      <generator class="native" />
-    </id>
-
-    &identifiableProperties;
-
-    <property name="name" column="name" length="230" />
-
-    <many-to-one name="program" class="org.hisp.dhis.program.Program" 
-       	column="programid" foreign-key="fk_programrulevariable_program" />
-    
-    <property name="sourceType" column="sourcetype">
-        <type name="org.hibernate.type.EnumType">
-            <param name="enumClass">org.hisp.dhis.programrule.ProgramRuleVariableSourceType</param>
-            <param name="type">12</param>
-        </type>
-    </property>
-    
-    <many-to-one name="attribute" class="org.hisp.dhis.trackedentity.TrackedEntityAttribute" 
-        column="trackedentityattributeid" foreign-key="fk_programrulevariable_trackedentityattribute" />
-    
-    <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" 
-        column="dataelementid" foreign-key="fk_programrulevariable_dataelement" />
-     
-    <many-to-one name="programStage" class="org.hisp.dhis.program.ProgramStage" 
-        column="programstageid" foreign-key="fk_programrulevariable_programstage" />
-        
-  </class>
-</hibernate-mapping>

=== added directory 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule'
=== added directory 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate'
=== added file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRule.hbm.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRule.hbm.xml	2015-04-21 15:08:21 +0000
@@ -0,0 +1,39 @@
+<?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"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.programrule.ProgramRule" table="programrule">
+
+    <cache usage="read-write" />
+
+    <id name="id" column="programruleid">
+      <generator class="native" />
+    </id>
+
+    &identifiableProperties;
+
+    <property name="name" column="name" length="230" />
+    
+    <property name="description" />
+
+    <many-to-one name="program" class="org.hisp.dhis.program.Program" 
+       	column="programid" foreign-key="fk_programrule_program" />
+    
+	<many-to-one name="programStage" class="org.hisp.dhis.program.ProgramStage" 
+		column="programstageid" foreign-key="fk_programrule_programstage" />
+
+    <set name="programRuleActions" cascade="all">
+		<key column="programruleid" />
+		<one-to-many class="org.hisp.dhis.programrule.ProgramRuleAction" />
+	</set>
+
+    <property name="condition" />
+   
+    <property name="priority" />
+   
+  </class>
+</hibernate-mapping>

=== added file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleAction.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleAction.hbm.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleAction.hbm.xml	2015-04-21 15:08:21 +0000
@@ -0,0 +1,40 @@
+<?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"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.programrule.ProgramRuleAction" table="programruleaction">
+
+    <cache usage="read-write" />
+
+    <id name="id" column="programruleactionid">
+      <generator class="native" />
+    </id>
+
+    &identifiableProperties;
+
+    <property name="name" column="name" length="230" />
+
+	<many-to-one name="programRule" class="org.hisp.dhis.programrule.ProgramRule" 
+		column="programruleid" foreign-key="fk_programruleaction_programrule" />
+
+    <property name="programRuleActionType" column="actiontype">
+        <type name="org.hibernate.type.EnumType">
+            <param name="enumClass">org.hisp.dhis.programrule.ProgramRuleActionType</param>
+            <param name="type">12</param>
+        </type>
+    </property>
+
+    <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" 
+        column="dataelementid" foreign-key="fk_programruleaction_dataelement" />
+
+    <property name="location" />
+   
+    <property name="content" />
+    
+    <property name="data" />
+  </class>
+</hibernate-mapping>

=== added file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleVariable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleVariable.hbm.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/programrule/hibernate/ProgramRuleVariable.hbm.xml	2015-04-21 15:08:21 +0000
@@ -0,0 +1,41 @@
+<?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"
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
+
+<hibernate-mapping>
+  <class name="org.hisp.dhis.programrule.ProgramRuleVariable" table="programrulevariable">
+
+    <cache usage="read-write" />
+
+    <id name="id" column="programrulevariableid">
+      <generator class="native" />
+    </id>
+
+    &identifiableProperties;
+
+    <property name="name" column="name" length="230" />
+
+    <many-to-one name="program" class="org.hisp.dhis.program.Program" 
+       	column="programid" foreign-key="fk_programrulevariable_program" />
+    
+    <property name="sourceType" column="sourcetype">
+        <type name="org.hibernate.type.EnumType">
+            <param name="enumClass">org.hisp.dhis.programrule.ProgramRuleVariableSourceType</param>
+            <param name="type">12</param>
+        </type>
+    </property>
+    
+    <many-to-one name="attribute" class="org.hisp.dhis.trackedentity.TrackedEntityAttribute" 
+        column="trackedentityattributeid" foreign-key="fk_programrulevariable_trackedentityattribute" />
+    
+    <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" 
+        column="dataelementid" foreign-key="fk_programrulevariable_dataelement" />
+     
+    <many-to-one name="programStage" class="org.hisp.dhis.program.ProgramStage" 
+        column="programstageid" foreign-key="fk_programrulevariable_programstage" />
+        
+  </class>
+</hibernate-mapping>