dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3486: Removed Source from local\in hibernate files

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 28 Apr 2011 13:09:29 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3486
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-04-28 18:37:21 +0530
message:
  Removed Source from local\in hibernate files
modified:
  dhis-2/dhis-web/dhis-web-portal/india-pom.xml
  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-reports/src/main/resources/org/hisp/dhis/reports/hibernate/Reports.hbm.xml
  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/DeTargetDataValue.hbm.xml
  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/survey/hibernate/Survey.hbm.xml
  local/in/dhis-in-services/dhis-in-service-survey/src/main/resources/org/hisp/dhis/survey/hibernate/SurveyDataValue.hbm.xml
  local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/hibernate/LLDataValue.hbm.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-portal/india-pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/india-pom.xml	2011-04-19 14:13:45 +0000
+++ dhis-2/dhis-web/dhis-web-portal/india-pom.xml	2011-04-28 13:07:21 +0000
@@ -195,14 +195,14 @@
     </dependency>
 	
 <!-- SMS Mobile application -->
-
+<!--
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-mobile</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
-       
+-->       
   </dependencies>
   <properties>
     <rootDir>../../</rootDir>

=== 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	2010-10-20 06:14:25 +0000
+++ 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
@@ -27,8 +27,7 @@
 
     <set name="sources" table="linelistsource">
       <key column="llgroupid"/>
-      <many-to-many column="sourceid" 
-        class="org.hisp.dhis.source.Source"/>
+	  <many-to-many column="sourceid" class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_llgroup_organisationunit"/>      
     </set>
       
     <set name="lineListLockedPeriods" table="linelistlockedPeriods">

=== 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-19 07:43:37 +0000
+++ 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
@@ -29,8 +29,7 @@
     
     <set name="sources" table="reportsource">
       <key column="reportid"/>
-      <many-to-many column="sourceid" 
-        class="org.hisp.dhis.source.Source"/>
+	  <many-to-many column="sourceid" class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_reportin_organisationunit"/>
     </set>
         
   </class>

=== 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-01-13 07:06:44 +0000
+++ 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
@@ -13,21 +13,10 @@
     <property name="name" not-null="true" unique="true" length="160"/>
     
     <property name="shortName" column="shortname" unique="true" length="60"/>
-    <!--  
-    <set name="dataelements" table="detargetmembers">
-      <key column="detargetid"/>
-      <many-to-many class="org.hisp.dhis.dataelement.DataElement" 
-          column="dataelementid" foreign-key="fk_detarget_dataelementid"/>
-	  <key column="detargetid"/>
-	  <many-to-many  class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" 
-          column="dataelementoptioncombo" foreign-key="fk_detarget_categoryoptioncomboid"/>
-	   
-    </set>
-    -->
+    
     <set name="sources" table="detargetsource">
       <key column="detargetid"/>
-      <many-to-many column="sourceid" 
-        class="org.hisp.dhis.source.Source" foreign-key="fk_detarget_sourceid"/>
+	  <many-to-many column="sourceid" class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_detarget_organisationunit"/>      
     </set>
     
     <property name="description" type="text"/>

=== 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-01-13 07:06:44 +0000
+++ 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
@@ -6,22 +6,13 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.detargetdatavalue.DeTargetDataValue" table="detargetdatavalue">
     <composite-id>
-      <key-many-to-one name="deTarget" class="org.hisp.dhis.detarget.DeTarget"
-          column="detargetid" foreign-key="fk_detargetdatavalue_detargetid"/>      
-      <key-many-to-one name="dataelement" class="org.hisp.dhis.dataelement.DataElement"
-              column="dataelementid" foreign-key="fk_detargetdatavalue_dataelementid"/>
-      <key-many-to-one name="decategoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" 
-              column="categoryoptioncomboid" foreign-key="fk_detargetdatavalue_categoryoptioncomboid"/>
-            <!--
-        The source relationship is made not lazy so that Hibernate won't put a
-        proxy on the reference which cannot be casted to the desired subclass.
-      -->
-      <key-many-to-one name="source" class="org.hisp.dhis.source.Source" lazy="false"
-          column="sourceid" foreign-key="fk_detargetdatavalue_sourceid"/>
-      <key-many-to-one name="period" class="org.hisp.dhis.period.Period" 
-          column="periodid" foreign-key="fk_detargetdatavalue_periodid"/>
-		 
+      <key-many-to-one name="deTarget" class="org.hisp.dhis.detarget.DeTarget" column="detargetid" foreign-key="fk_detargetdatavalue_detargetid"/>      
+      <key-many-to-one name="dataelement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_detargetdatavalue_dataelementid"/>
+      <key-many-to-one name="decategoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid" foreign-key="fk_detargetdatavalue_categoryoptioncomboid"/>
+      <key-many-to-one name="source" class="org.hisp.dhis.organisationunit.OrganisationUnit" lazy="false" column="sourceid" foreign-key="fk_detargetdatavalue_organisationunitid" />	
+      <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_detargetdatavalue_periodid"/>		 
     </composite-id>
+	
     <property name="value"/>
     <property name="storedBy" column="storedby" length="50"/>
     <property name="timestamp" column="lastupdated" type="date"/>

=== 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-01-13 07:06:44 +0000
+++ 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
@@ -7,14 +7,11 @@
   
 	<class name="org.hisp.dhis.detarget.DeTargetMember" table="detargetmember">
 		<composite-id>
+			
 		  <key-many-to-one name="detarget" class="org.hisp.dhis.detarget.DeTarget" 
 			  column="detargetid" foreign-key="fk_detargetmember_detargetid"/>	
 		  <key-many-to-one name="dataelements" class="org.hisp.dhis.dataelement.DataElement"
-			  column="dataelementid" foreign-key="fk_detargetmember_dataelementid"/>
-		  <!--
-			The source relationship is made not lazy so that Hibernate won't put a
-			proxy on the reference which cannot be casted to the desired subclass.
-		  -->
+			  column="dataelementid" foreign-key="fk_detargetmember_dataelementid"/>		 
 		  <key-many-to-one name="decategoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" 
 			  column="categoryoptioncomboid" foreign-key="fk_detargetmember_categoryoptioncomboid"/>
 			

=== 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	2010-06-04 11:50:05 +0000
+++ 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
@@ -22,8 +22,7 @@
     
     <set name="sources" table="surveysource">
       <key column="surveyid"/>
-      <many-to-many column="sourceid" 
-        class="org.hisp.dhis.source.Source" foreign-key="fk_survey_sourceid"/>
+	  <many-to-many column="sourceid" class="org.hisp.dhis.organisationunit.OrganisationUnit" foreign-key="fk_survey_organisationunit"/>      
     </set>
     
     <property name="description" type="text"/>

=== 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	2010-06-04 11:50:05 +0000
+++ 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
@@ -6,22 +6,12 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.surveydatavalue.SurveyDataValue" table="surveydatavalue">
     <composite-id>
-      <key-many-to-one name="survey" class="org.hisp.dhis.survey.Survey"
-          column="surveyid" foreign-key="fk_surveydatavalue_surveyid"/>      
-      <key-many-to-one name="indicator" class="org.hisp.dhis.indicator.Indicator" 
-          column="indicatorid" foreign-key="fk_surveydatavalue_indicatorid"/>
-      
-            <!--
-        The source relationship is made not lazy so that Hibernate won't put a
-        proxy on the reference which cannot be casted to the desired subclass.
-      -->
-            <key-many-to-one name="source" class="org.hisp.dhis.source.Source" lazy="false"
-          column="sourceid" foreign-key="fk_surveydatavalue_surveyid"/>
-       
+      <key-many-to-one name="survey" class="org.hisp.dhis.survey.Survey" column="surveyid" foreign-key="fk_surveydatavalue_surveyid"/>      
+      <key-many-to-one name="indicator" class="org.hisp.dhis.indicator.Indicator" column="indicatorid" foreign-key="fk_surveydatavalue_indicatorid"/>
+	  <key-many-to-one name="source" class="org.hisp.dhis.organisationunit.OrganisationUnit" lazy="false" column="sourceid" foreign-key="fk_surveydatavalue_organisationunitid" />       
     </composite-id>
     <property name="value"/>
     <property name="storedBy" column="storedby" length="50"/>
-    <property name="timestamp" column="lastupdated" type="date"/>
-  
+    <property name="timestamp" column="lastupdated" type="date"/>  
   </class>
 </hibernate-mapping>
\ No newline at end of file

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/hibernate/LLDataValue.hbm.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/hibernate/LLDataValue.hbm.xml	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/org/hisp/dhis/den/hibernate/LLDataValue.hbm.xml	2011-04-28 13:07:21 +0000
@@ -5,33 +5,14 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.den.api.LLDataValue" table="lldatavalue">
 	 <composite-id>
-      <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
-          column="dataelementid" foreign-key="fk_lldatavalue_dataelementid" />
-      <key-many-to-one name="period" class="org.hisp.dhis.period.Period" 
-          column="periodid" foreign-key="fk_lldatavalue_periodid"/>
-      <!--
-        The source relationship is made not lazy so that Hibernate won't put a
-        proxy on the reference which cannot be casted to the desired subclass.
-      -->
-      <key-many-to-one name="source" class="org.hisp.dhis.source.Source" lazy="false"
-          column="sourceid" foreign-key="fk_lldatavalue_sourceid"/>
-	    <key-many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" 
-          column="categoryoptioncomboid" foreign-key="fk_lldatavalue_categoryoptioncomboid"/>
-
-		<key-property name="recordNo" column="recordno" type="integer"/>
-		
+      <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_lldatavalue_dataelementid" />
+      <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_lldatavalue_periodid"/>
+	  <key-many-to-one name="source" class="org.hisp.dhis.organisationunit.OrganisationUnit" lazy="false" column="sourceid" foreign-key="fk_lldatavalue_organisationunitid" />       
+      <key-many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid" foreign-key="fk_lldatavalue_categoryoptioncomboid"/>
+	  <key-property name="recordNo" column="recordno" type="integer"/>		
     </composite-id>
 
-	<!-- many-to-many name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_datavalue_dataelementid" unique="false"/>
-
-	<many-to-many name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_datavalue_periodid" unique="false"/>
-
-	<many-to-many name="source" class="org.hisp.dhis.source.Source" column="sourceid" foreign-key="fk_datavalue_sourceid" unique="false"/>
-
-	<many-to-many name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid" foreign-key="fk_datavalue_categoryoptioncomboid" unique="false"/>
-	
-    <property name="value"/-->
-	<property  name="value"         column="value" />
+	<property  name="value" column="value" />
     <property name="storedBy" column="storedby" length="31"/>
     <property name="timestamp" column="lastupdated" type="date"/>
     <property name="comment" length="360"/>