dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11624
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3364: xml formatting cleanup in dhis-service-core
------------------------------------------------------------
revno: 3364
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-04-12 15:25:06 +0200
message:
xml formatting cleanup in dhis-service-core
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/concept/hibernate/Concept.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml
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/DataElement.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryCombo.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementOperand.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
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/datavalue/hibernate/DataValue.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/expression/hibernate/Expression.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorType.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml
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/organisationunit/hibernate/OrganisationUnit.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml
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/OrganisationUnitLevel.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/Period.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/PeriodType.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sequence/hibernate/Sequence.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.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-services/dhis-service-core/src/main/resources/org/hisp/dhis/concept/hibernate/Concept.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/concept/hibernate/Concept.hbm.xml 2010-10-07 07:10:30 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/concept/hibernate/Concept.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,14 +4,14 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.concept.Concept" table="concept">
+ <class name="org.hisp.dhis.concept.Concept" table="concept">
<id name="id" column="conceptid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="10"/>
+ <column name="name" not-null="true" unique="true" length="10" />
</property>
</class>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml 2011-04-12 13:25:06 +0000
@@ -6,29 +6,29 @@
<hibernate-mapping>
<class name="org.hisp.dhis.datadictionary.DataDictionary" table="datadictionary">
- <cache usage="read-write"/>
-
+ <cache usage="read-write" />
+
<id name="id" column="datadictionaryid">
- <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="description" type="text"/>
-
- <property name="region"/>
-
+
+ <property name="description" type="text" />
+
+ <property name="region" />
+
<set name="dataElements" table="datadictionarydataelements">
- <key column="datadictionaryid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"/>
+ <key column="datadictionaryid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" />
</set>
-
+
<set name="indicators" table="datadictionaryindicators">
- <key column="datadictionaryid"/>
- <many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid"/>
+ <key column="datadictionaryid" />
+ <many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid" />
</set>
-
+
</class>
</hibernate-mapping>
=== 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 2011-04-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CalculatedDataElement.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,17 +4,15 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <joined-subclass name="org.hisp.dhis.dataelement.CalculatedDataElement"
- extends="org.hisp.dhis.dataelement.DataElement" table="calculateddataelement">
-
- <key column="calculateddataelementid"/>
-
- <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"/>
-
+ <joined-subclass name="org.hisp.dhis.dataelement.CalculatedDataElement" extends="org.hisp.dhis.dataelement.DataElement"
+ table="calculateddataelement">
+
+ <key column="calculateddataelementid" />
+
+ <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" />
+
</joined-subclass>
-
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== 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-04-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,71 +5,71 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataelement.DataElement" table="dataelement">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="dataelementid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
<property name="alternativeName">
- <column name="alternativename" not-null="false" unique="true" length="230"/>
+ <column name="alternativename" not-null="false" unique="true" length="230" />
</property>
-
+
<property name="shortName">
- <column name="shortname" not-null="true" unique="true" length="25"/>
+ <column name="shortname" not-null="true" unique="true" length="25" />
</property>
<property name="code">
- <column name="code" not-null="false" unique="false" length="100"/>
+ <column name="code" not-null="false" unique="false" length="100" />
</property>
-
- <property name="description" type="text"/>
-
- <property name="active" not-null="true"/>
-
- <property name="type" column="valuetype" length="16" not-null="true"/>
-
- <property name="numberType" column="numbertype" length="16"/>
-
- <property name="domainType" column="domaintype" length="16"/>
-
- <property name="aggregationOperator" not-null="true" column="aggregationtype" length="16"/>
-
- <many-to-one name="categoryCombo" class="org.hisp.dhis.dataelement.DataElementCategoryCombo"
- column="categorycomboid" foreign-key="fk_dataelement_categorycomboid"/>
-
- <property name="sortOrder"/>
-
- <property name="url"/>
-
- <property name="lastUpdated"/>
-
- <set name="groups" table="dataelementgroupmembers" inverse="true">
- <key column="dataelementid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementGroup" column="dataelementgroupid"/>
- </set>
-
+
+ <property name="description" type="text" />
+
+ <property name="active" not-null="true" />
+
+ <property name="type" column="valuetype" length="16" not-null="true" />
+
+ <property name="numberType" column="numbertype" length="16" />
+
+ <property name="domainType" column="domaintype" length="16" />
+
+ <property name="aggregationOperator" not-null="true" column="aggregationtype" length="16" />
+
+ <many-to-one name="categoryCombo" class="org.hisp.dhis.dataelement.DataElementCategoryCombo" column="categorycomboid"
+ foreign-key="fk_dataelement_categorycomboid" />
+
+ <property name="sortOrder" />
+
+ <property name="url" />
+
+ <property name="lastUpdated" />
+
+ <set name="groups" table="dataelementgroupmembers" inverse="true">
+ <key column="dataelementid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementGroup" column="dataelementgroupid" />
+ </set>
+
<set name="dataSets" table="datasetmembers" inverse="true">
- <key column="dataelementid"/>
- <many-to-many class="org.hisp.dhis.dataset.DataSet" column="datasetid"/>
+ <key column="dataelementid" />
+ <many-to-many class="org.hisp.dhis.dataset.DataSet" column="datasetid" />
</set>
-
+
<list name="aggregationLevels" table="dataelementaggregationlevels">
- <key column="dataelementid"/>
- <list-index column="sort_order" base="0"/>
- <element column="aggregationlevel" type="integer"/>
+ <key column="dataelementid" />
+ <list-index column="sort_order" base="0" />
+ <element column="aggregationlevel" type="integer" />
</list>
-
- <property name="zeroIsSignificant"/>
-
+
+ <property name="zeroIsSignificant" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,30 +5,30 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataelement.DataElementCategory" table="dataelementcategory">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="categoryid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="160" />
</property>
-
- <many-to-one name="concept" class="org.hisp.dhis.concept.Concept"
- column="conceptid" foreign-key="fk_dataelementcategory_conceptid"/>
-
+
+ <many-to-one name="concept" class="org.hisp.dhis.concept.Concept" column="conceptid"
+ foreign-key="fk_dataelementcategory_conceptid" />
+
<list name="categoryOptions" table="categories_categoryoptions">
- <key column="categoryid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOption"
- column="categoryoptionid" foreign-key="fk_category_categoryoptionid" unique="true"/>
- </list>
-
+ <key column="categoryid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOption" column="categoryoptionid"
+ foreign-key="fk_category_categoryoptionid" unique="true" />
+ </list>
+
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryCombo.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryCombo.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryCombo.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,30 +4,30 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.dataelement.DataElementCategoryCombo" table="categorycombo">
-
- <cache usage="read-write"/>
-
+ <class name="org.hisp.dhis.dataelement.DataElementCategoryCombo" table="categorycombo">
+
+ <cache usage="read-write" />
+
<id name="id" column="categorycomboid">
- <generator class="native"/>
- </id>
-
+ <generator class="native" />
+ </id>
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
- </property>
-
- <list name="categories" table="categorycombos_categories" >
- <key column="categorycomboid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementCategory"
- column="categoryid" foreign-key="fk_categorycombo_categoryid"/>
+ <column name="name" not-null="true" unique="true" length="160" />
+ </property>
+
+ <list name="categories" table="categorycombos_categories">
+ <key column="categorycomboid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementCategory" column="categoryid"
+ foreign-key="fk_categorycombo_categoryid" />
</list>
<set name="optionCombos" table="categorycombos_optioncombos" inverse="true" cascade="all">
- <key column="categorycomboid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
- column="categoryoptioncomboid" foreign-key="fk_categorycombo_categoryoptioncomboid" unique="true"/>
- </set>
-
- </class>
+ <key column="categorycomboid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid"
+ foreign-key="fk_categorycombo_categoryoptioncomboid" unique="true" />
+ </set>
+
+ </class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,30 +4,29 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.dataelement.DataElementCategoryOption" table="dataelementcategoryoption">
-
- <cache usage="read-write"/>
-
+ <class name="org.hisp.dhis.dataelement.DataElementCategoryOption" table="dataelementcategoryoption">
+
+ <cache usage="read-write" />
+
<id name="id" column="categoryoptionid">
- <generator class="native"/>
- </id>
-
- <property name="uuid" length="40"/>
-
+ <generator class="native" />
+ </id>
+
+ <property name="uuid" length="40" />
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="160" />
</property>
-
+
<set name="categoryOptionCombos" table="categoryoptioncombos_categoryoptions" inverse="true">
- <key column="categoryoptionid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
- column="categoryoptioncomboid" foreign-key="fk_categoryoption_categoryoptioncomboid"/>
- </set>
-
+ <key column="categoryoptionid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" column="categoryoptioncomboid"
+ foreign-key="fk_categoryoption_categoryoptioncomboid" />
+ </set>
+
<join table="categories_categoryoptions" inverse="true">
- <key column="categoryoptionid"/>
- <many-to-one column="categoryid" name="category"/>
+ <key column="categoryoptionid" />
+ <many-to-one column="categoryid" name="category" />
</join>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,29 +4,28 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" table="categoryoptioncombo">
-
- <cache usage="read-write"/>
-
+ <class name="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo" table="categoryoptioncombo">
+
+ <cache usage="read-write" />
+
<id name="id" column="categoryoptioncomboid">
- <generator class="native"/>
- </id>
+ <generator class="native" />
+ </id>
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
<list name="categoryOptions" table="categoryoptioncombos_categoryoptions">
- <key column="categoryoptioncomboid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOption"
- column="categoryoptionid" foreign-key="fk_categoryoptioncombo_categoryoptionid"/>
+ <key column="categoryoptioncomboid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementCategoryOption" column="categoryoptionid"
+ foreign-key="fk_categoryoptioncombo_categoryoptionid" />
</list>
-
+
<join table="categorycombos_optioncombos">
- <key column="categoryoptioncomboid"/>
- <many-to-one name="categoryCombo" column="categorycomboid"/>
- </join>
-
+ <key column="categoryoptioncomboid" />
+ <many-to-one name="categoryCombo" column="categorycomboid" />
+ </join>
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml 2009-11-06 10:43:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,33 +4,32 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
<class name="org.hisp.dhis.dataelement.DataElementGroup" table="dataelementgroup">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="dataelementgroupid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
+
<set name="members" table="dataelementgroupmembers">
- <key column="dataelementgroupid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_dataelementgroup_dataelementid"/>
+ <key column="dataelementgroupid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+ foreign-key="fk_dataelementgroup_dataelementid" />
</set>
-
- <join table="dataelementgroupsetmembers" inverse="true">
- <key column="dataelementgroupid"/>
- <many-to-one column="dataelementgroupsetid" name="groupSet"/>
- </join>
+
+ <join table="dataelementgroupsetmembers" inverse="true">
+ <key column="dataelementgroupid" />
+ <many-to-one column="dataelementgroupsetid" name="groupSet" />
+ </join>
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml 2009-11-06 14:08:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,25 +5,25 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataelement.DataElementGroupSet" table="dataelementgroupset">
-
+
<id name="id" column="dataelementgroupsetid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
+
<list name="members" table="dataelementgroupsetmembers">
- <key column="dataelementgroupsetid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementGroup"
- column="dataelementgroupid" unique="true" foreign-key="fk_dataelementgroupset_dataelementgroupid"/>
+ <key column="dataelementgroupsetid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementGroup" column="dataelementgroupid" unique="true"
+ foreign-key="fk_dataelementgroupset_dataelementgroupid" />
</list>
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementOperand.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementOperand.hbm.xml 2010-03-22 07:52:24 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementOperand.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,16 +5,16 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataelement.DataElementOperand" table="dataelementoperand">
-
+
<id name="id" column="dataelementoperandid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
- <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_dataelementoperand_dataelement"/>
-
- <many-to-one name="categoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
- column="categoryoptioncomboid" foreign-key="fk_dataelementoperand_dataelementcategoryoptioncombo"/>
+
+ <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+ foreign-key="fk_dataelementoperand_dataelement" />
+
+ <many-to-one name="categoryOptionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
+ column="categoryoptioncomboid" foreign-key="fk_dataelementoperand_dataelementcategoryoptioncombo" />
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml 2010-09-16 14:03:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,13 +4,14 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataentryform.DataEntryForm" table="dataentryform">
+
<id name="id" column="dataentryformid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="name" not-null="true" unique="true" length="160"/>
-
- <property name="htmlCode" column="htmlcode" type="text"/>
-
+ <property name="name" not-null="true" unique="true" length="160" />
+
+ <property name="htmlCode" column="htmlcode" type="text" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,18 +5,19 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataset.CompleteDataSetRegistration" table="completedatasetregistration">
+
<composite-id>
- <key-many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet"
- column="datasetid" foreign-key="fk_datasetcompleteregistration_datasetid"/>
- <key-many-to-one name="period" class="org.hisp.dhis.period.Period"
- column="periodid" foreign-key="fk_datasetcompleteregistration_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_datasetcompleteregistration_sourceid"/>
+ <key-many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid"
+ foreign-key="fk_datasetcompleteregistration_datasetid" />
+ <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid"
+ foreign-key="fk_datasetcompleteregistration_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_datasetcompleteregistration_sourceid" />
</composite-id>
- <property name="date" type="date" column="date"/>
+
+ <property name="date" type="date" column="date" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,58 +5,57 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataset.DataSet" table="dataset">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="datasetid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
- <property name="name" not-null="true" unique="true" length="230"/>
-
- <property name="shortName" unique="true" length="60"/>
-
- <property name="code" unique="true" length="60"/>
-
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" lazy="false"
- column="periodtypeid" not-null="true" foreign-key="fk_dataset_periodtypeid"/>
+ <property name="name" not-null="true" unique="true" length="230" />
+
+ <property name="shortName" unique="true" length="60" />
+
+ <property name="code" unique="true" length="60" />
+
+ <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" lazy="false" column="periodtypeid"
+ not-null="true" foreign-key="fk_dataset_periodtypeid" />
<set name="dataElements" table="datasetmembers">
- <key column="datasetid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_dataset_dataelementid"/>
- </set>
-
- <set name="compulsoryDataElementOperands" table="datasetoperands" cascade="all-delete-orphan">
- <key column="datasetid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementOperand"
- column="dataelementoperandid" foreign-key="fk_dataset_dataelementoperandid"/>
- </set>
-
+ <key column="datasetid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_dataset_dataelementid" />
+ </set>
+
+ <set name="compulsoryDataElementOperands" table="datasetoperands" cascade="all-delete-orphan">
+ <key column="datasetid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementOperand" column="dataelementoperandid"
+ foreign-key="fk_dataset_dataelementoperandid" />
+ </set>
+
<set name="sources" table="datasetsource">
- <key column="datasetid"/>
- <many-to-many column="sourceid"
- class="org.hisp.dhis.source.Source"/>
- </set>
-
- <set name="sections" order-by="sortorder" inverse="true" cascade="all">
- <key column="datasetid"/>
- <one-to-many class="org.hisp.dhis.dataset.Section"/>
- </set>
-
- <property name="locked"/>
-
- <property name="sortOrder"/>
-
- <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm" foreign-key="fk_dataset_dataentryform" cascade="all" />
-
- <property name="mobile"/>
-
- <property name="version"/>
-
+ <key column="datasetid" />
+ <many-to-many column="sourceid" class="org.hisp.dhis.source.Source" />
+ </set>
+
+ <set name="sections" order-by="sortorder" inverse="true" cascade="all">
+ <key column="datasetid" />
+ <one-to-many class="org.hisp.dhis.dataset.Section" />
+ </set>
+
+ <property name="locked" />
+
+ <property name="sortOrder" />
+
+ <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm" foreign-key="fk_dataset_dataentryform"
+ cascade="all" />
+
+ <property name="mobile" />
+
+ <property name="version" />
+
</class>
</hibernate-mapping>
=== 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-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,31 +5,30 @@
<hibernate-mapping>
<class name="org.hisp.dhis.dataset.Section" table="section">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="sectionid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="name" not-null="true" />
-
- <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid"/>
-
- <list name="dataElements" table="sectiondataelements">
- <key column="sectionid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_section_dataelementid"/>
- </list>
-
- <set name="greyedFields" table="sectiongreyedfields">
- <key column="sectionid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElementOperand"
- column="dataelementoperandid" foreign-key="fk_section_dataelementoperandid"/>
- </set>
-
- <property name="sortOrder" column="sortorder" not-null="true"/>
+ <property name="name" not-null="true" />
+
+ <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" column="datasetid" />
+
+ <list name="dataElements" table="sectiondataelements">
+ <key column="sectionid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_section_dataelementid" />
+ </list>
+
+ <set name="greyedFields" table="sectiongreyedfields">
+ <key column="sectionid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElementOperand" column="dataelementoperandid"
+ foreign-key="fk_section_dataelementoperandid" />
+ </set>
+
+ <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/datavalue/hibernate/DataValue.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2009-12-23 07:35:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,25 +4,28 @@
<hibernate-mapping>
<class name="org.hisp.dhis.datavalue.DataValue" table="datavalue">
+
<composite-id>
- <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_datavalue_dataelementid"/>
- <key-many-to-one name="period" class="org.hisp.dhis.period.Period"
- column="periodid" foreign-key="fk_datavalue_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_datavalue_sourceid"/>
- <key-many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
- column="categoryoptioncomboid" foreign-key="fk_datavalue_categoryoptioncomboid"/>
-
+ <key-many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+ foreign-key="fk_datavalue_dataelementid" />
+ <key-many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_datavalue_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_datavalue_sourceid" />
+ <key-many-to-one name="optionCombo" class="org.hisp.dhis.dataelement.DataElementCategoryOptionCombo"
+ column="categoryoptioncomboid" foreign-key="fk_datavalue_categoryoptioncomboid" />
</composite-id>
- <property name="value"/>
- <property name="storedBy" column="storedby" length="31"/>
- <property name="timestamp" column="lastupdated" type="date"/>
- <property name="comment" length="360"/>
- <property name="followup"/>
+
+ <property name="value" />
+
+ <property name="storedBy" column="storedby" length="31" />
+
+ <property name="timestamp" column="lastupdated" type="date" />
+
+ <property name="comment" length="360" />
+
+ <property name="followup" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml 2010-10-29 14:09:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml 2011-04-12 13:25:06 +0000
@@ -3,20 +3,26 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.datavalue.DataValueAudit" table="datavalue_audit">
- <id name="id">
- <generator class="native" />
- </id>
- <many-to-one name="dataValue" class="org.hisp.dhis.datavalue.DataValue"
- foreign-key="fk_datavalueaudit_datavalue">
- <column name="dataelementid" />
- <column name="periodid" />
- <column name="sourceid" />
- <column name="categoryoptioncomboid" />
- </many-to-one>
- <property name="value"/>
- <property name="storedBy" column="storedby" length="31"/>
- <property name="timeStamp" column="lastupdated" type="date"/>
- <property name="comment" length="360"/>
- </class>
+ <class name="org.hisp.dhis.datavalue.DataValueAudit" table="datavalue_audit">
+
+ <id name="id">
+ <generator class="native" />
+ </id>
+
+ <many-to-one name="dataValue" class="org.hisp.dhis.datavalue.DataValue" foreign-key="fk_datavalueaudit_datavalue">
+ <column name="dataelementid" />
+ <column name="periodid" />
+ <column name="sourceid" />
+ <column name="categoryoptioncomboid" />
+ </many-to-one>
+
+ <property name="value" />
+
+ <property name="storedBy" column="storedby" length="31" />
+
+ <property name="timeStamp" column="lastupdated" type="date" />
+
+ <property name="comment" length="360" />
+
+ </class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/expression/hibernate/Expression.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/expression/hibernate/Expression.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/expression/hibernate/Expression.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,18 +5,19 @@
<hibernate-mapping>
<class name="org.hisp.dhis.expression.Expression" table="expression">
+
<id name="id" column="expressionid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
- <property name="description"/>
-
- <property name="expression" type="text"/>
-
+
+ <property name="description" />
+
+ <property name="expression" type="text" />
+
<set name="dataElementsInExpression" table="expressiondataelement">
- <key column="expressionid"/>
- <many-to-many class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_expression_dataelementid"/>
+ <key column="expressionid" />
+ <many-to-many class="org.hisp.dhis.dataelement.DataElement" column="dataelementid" foreign-key="fk_expression_dataelementid" />
</set>
+
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2011-01-17 17:03:05 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,69 +5,69 @@
<hibernate-mapping>
<class name="org.hisp.dhis.indicator.Indicator" table="indicator">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="indicatorid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
- </property>
-
- <property name="alternativeName">
- <column name="alternativename" not-null="false" unique="true" length="230"/>
- </property>
-
+ <column name="name" not-null="true" unique="true" length="230" />
+ </property>
+
+ <property name="alternativeName">
+ <column name="alternativename" not-null="false" unique="true" length="230" />
+ </property>
+
<property name="shortName">
- <column name="shortname" not-null="true" unique="true" length="25"/>
+ <column name="shortname" not-null="true" unique="true" length="25" />
</property>
-
+
<property name="code">
- <column name="code" not-null="false" unique="false" length="25"/>
+ <column name="code" not-null="false" unique="false" length="25" />
</property>
-
- <property name="description" type="text"/>
-
- <property name="annualized" column="annualized"/>
-
- <many-to-one name="indicatorType" class="org.hisp.dhis.indicator.IndicatorType"
- column="indicatortypeid" foreign-key="fk_indicator_indicatortypeid"/>
-
- <property name="numerator" column="numerator" type="text"/>
-
- <property name="numeratorDescription" column="numeratordescription" type="text"/>
-
- <property name="numeratorAggregationOperator" column="numeratoraggregationtype" length="16"/>
-
- <property name="denominator" column="denominator" type="text"/>
-
- <property name="denominatorDescription" column="denominatordescription" type="text"/>
-
- <property name="denominatorAggregationOperator" column="denominatoraggregationtype" length="16"/>
-
- <property name="sortOrder"/>
-
- <property name="url"/>
-
- <property name="lastUpdated"/>
-
+
+ <property name="description" type="text" />
+
+ <property name="annualized" column="annualized" />
+
+ <many-to-one name="indicatorType" class="org.hisp.dhis.indicator.IndicatorType" column="indicatortypeid"
+ foreign-key="fk_indicator_indicatortypeid" />
+
+ <property name="numerator" column="numerator" type="text" />
+
+ <property name="numeratorDescription" column="numeratordescription" type="text" />
+
+ <property name="numeratorAggregationOperator" column="numeratoraggregationtype" length="16" />
+
+ <property name="denominator" column="denominator" type="text" />
+
+ <property name="denominatorDescription" column="denominatordescription" type="text" />
+
+ <property name="denominatorAggregationOperator" column="denominatoraggregationtype" length="16" />
+
+ <property name="sortOrder" />
+
+ <property name="url" />
+
+ <property name="lastUpdated" />
+
<set name="groups" table="indicatorgroupmembers" inverse="true">
- <key column="indicatorid"/>
- <many-to-many class="org.hisp.dhis.indicator.IndicatorGroup" column="indicatorgroupid"/>
+ <key column="indicatorid" />
+ <many-to-many class="org.hisp.dhis.indicator.IndicatorGroup" column="indicatorgroupid" />
</set>
-
+
<list name="groupSets" table="indicator_indicatorgroupsetmembers">
- <key column="indicatorid"/>
- <list-index column="sort_order" base="0"/>
- <many-to-many class="org.hisp.dhis.indicator.IndicatorGroupSet"
- column="indicatorgroupsetid" foreign-key="fk_indicator_indicatorgroupsetid"/>
+ <key column="indicatorid" />
+ <list-index column="sort_order" base="0" />
+ <many-to-many class="org.hisp.dhis.indicator.IndicatorGroupSet" column="indicatorgroupsetid"
+ foreign-key="fk_indicator_indicatorgroupsetid" />
</list>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2009-11-06 10:43:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,31 +5,30 @@
<hibernate-mapping>
<class name="org.hisp.dhis.indicator.IndicatorGroup" table="indicatorgroup">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="indicatorgroupid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
+
<set name="members" table="indicatorgroupmembers">
- <key column="indicatorgroupid"/>
- <many-to-many class="org.hisp.dhis.indicator.Indicator"
- column="indicatorid" foreign-key="fk_indicatorgroup_indicatorid"/>
+ <key column="indicatorgroupid" />
+ <many-to-many class="org.hisp.dhis.indicator.Indicator" column="indicatorid" foreign-key="fk_indicatorgroup_indicatorid" />
</set>
-
+
<join table="indicatorgroupsetmembers" inverse="true">
- <key column="indicatorgroupid"/>
- <many-to-one column="indicatorgroupsetid" name="groupSet"/>
+ <key column="indicatorgroupid" />
+ <many-to-one column="indicatorgroupsetid" name="groupSet" />
</join>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml 2009-11-06 10:43:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml 2011-04-12 13:25:06 +0000
@@ -3,26 +3,26 @@
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
-<hibernate-mapping>
+<hibernate-mapping>
<class name="org.hisp.dhis.indicator.IndicatorGroupSet" table="indicatorgroupset">
-
+
<id name="id" column="indicatorgroupsetid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
+
<list name="members" table="indicatorgroupsetmembers">
- <key column="indicatorgroupsetid"/>
- <list-index column="sort_order" base="1"/>
- <many-to-many class="org.hisp.dhis.indicator.IndicatorGroup"
- column="indicatorgroupid" unique="true" foreign-key="fk_indicatorgroupset_indicatorgroupid"/>
+ <key column="indicatorgroupsetid" />
+ <list-index column="sort_order" base="1" />
+ <many-to-many class="org.hisp.dhis.indicator.IndicatorGroup" column="indicatorgroupid" unique="true"
+ foreign-key="fk_indicatorgroupset_indicatorgroupid" />
</list>
</class>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorType.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorType.hbm.xml 2010-12-16 04:38:17 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorType.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,20 +5,20 @@
<hibernate-mapping>
<class name="org.hisp.dhis.indicator.IndicatorType" table="indicatortype">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="indicatortypeid">
- <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="factor" column="indicatorfactor" not-null="true"/>
-
- <property name="number" column="indicatornumber"/>
+ <property name="factor" column="indicatorfactor" not-null="true" />
+
+ <property name="number" column="indicatornumber" />
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml 2011-04-01 19:47:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,25 +5,25 @@
<hibernate-mapping>
<class name="org.hisp.dhis.message.Message" table="message">
-
- <cache usage="read-write"/>
+
+ <cache usage="read-write" />
<id name="id" column="messageid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="key" column="messagekey" not-null="true"/>
- <property name="subject" column="messagesubject" not-null="true"/>
- <property name="text" column="messagetext" type="text"/>
-
- <many-to-one name="sender" class="org.hisp.dhis.user.User"
- column="userid" foreign-key="fk_message_user" not-null="true"/>
-
+ <property name="key" column="messagekey" not-null="true" />
+ <property name="subject" column="messagesubject" not-null="true" />
+ <property name="text" column="messagetext" type="text" />
+
+ <many-to-one name="sender" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_message_user"
+ not-null="true" />
+
<set name="userMessages" table="message_usermessages" cascade="save-update">
- <key column="messageid"/>
- <many-to-many class="org.hisp.dhis.message.UserMessage"
- column="usermessageid" unique="true" foreign-key="fk_message_usermessages"/>
+ <key column="messageid" />
+ <many-to-many class="org.hisp.dhis.message.UserMessage" column="usermessageid" unique="true"
+ foreign-key="fk_message_usermessages" />
</set>
-
+
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml 2011-04-01 10:32:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml 2011-04-12 13:25:06 +0000
@@ -6,22 +6,22 @@
<hibernate-mapping>
<class name="org.hisp.dhis.message.UserMessage" table="usermessage">
- <cache usage="read-write"/>
-
+ <cache usage="read-write" />
+
<id name="id" column="usermessageid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <many-to-one name="user" class="org.hisp.dhis.user.User"
- column="userid" foreign-key="fk_usermessage_user" not-null="true"/>
-
- <property name="read" column="isread" not-null="true"/>
- <property name="messageDate" column="messagedate" not-null="true"/>
-
+ <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_usermessage_user"
+ not-null="true" />
+
+ <property name="read" column="isread" not-null="true" />
+ <property name="messageDate" column="messagedate" not-null="true" />
+
<join table="message_usermessages" inverse="true">
- <key column="usermessageid"/>
- <many-to-one column="messageid" name="message" not-null="true"/>
+ <key column="usermessageid" />
+ <many-to-one column="messageid" name="message" not-null="true" />
</join>
-
+
</class>
-</hibernate-mapping>
\ No newline at end of file
+</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 2011-04-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/minmax/hibernate/MinMaxDataElement.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,19 +5,21 @@
<hibernate-mapping>
<class name="org.hisp.dhis.minmax.MinMaxDataElement" table="minmaxdataelement">
+
<id name="id" column="minmaxdataelementid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <many-to-one name="source" class="org.hisp.dhis.source.Source"
- column="sourceid" foreign-key="fk_minmaxdataelement_sourceid" index="index_minmaxdataelement"/>
- <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_minmaxdataelement_dataelementid" index="index_minmaxdataelement"/>
- <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" not-null="true"/>
- <property name="max" column="maxvalue" not-null="true"/>
- <property name="generated" not-null="true"/>
+ <many-to-one name="source" class="org.hisp.dhis.source.Source" column="sourceid" foreign-key="fk_minmaxdataelement_sourceid"
+ index="index_minmaxdataelement" />
+ <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+ foreign-key="fk_minmaxdataelement_dataelementid" index="index_minmaxdataelement" />
+ <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" 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-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml 2011-04-12 13:25:06 +0000
@@ -3,77 +3,76 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <joined-subclass name="org.hisp.dhis.organisationunit.OrganisationUnit"
- extends="org.hisp.dhis.source.Source" table="organisationunit">
-
- <key column="organisationunitid"/>
-
- <property name="uuid">
- <column name="uuid" length="40"/>
- </property>
-
+ <joined-subclass name="org.hisp.dhis.organisationunit.OrganisationUnit" extends="org.hisp.dhis.source.Source"
+ table="organisationunit">
+
+ <key column="organisationunitid" />
+
+ <property name="uuid">
+ <column name="uuid" length="40" />
+ </property>
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
- <set name="children" inverse="true" cascade="save-update,delete-orphan">
- <key column="parentid"/>
- <one-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit"/>
+
+ <set name="children" inverse="true" cascade="save-update,delete-orphan">
+ <key column="parentid" />
+ <one-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit" />
</set>
-
- <many-to-one name="parent" class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="parentid" foreign-key="fk_parentid" index="in_parentid"/>
-
+
+ <many-to-one name="parent" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="parentid"
+ foreign-key="fk_parentid" index="in_parentid" />
+
<property name="shortName">
- <column name="shortname" not-null="true" unique="false" length="50"/>
+ <column name="shortname" not-null="true" unique="false" length="50" />
</property>
-
+
<property name="code">
- <column name="code" not-null="false" unique="false" length="25"/>
+ <column name="code" not-null="false" unique="false" length="25" />
</property>
-
- <property name="openingDate" column="openingdate" type="date"/>
-
- <property name="closedDate" column="closeddate" type="date"/>
-
- <property name="active" not-null="true"/>
-
- <property name="comment" type="text"/>
-
- <property name="geoCode"/>
-
- <property name="featureType"/>
-
- <property name="coordinates" type="text"/>
-
- <property name="url"/>
-
- <property name="lastUpdated"/>
-
+
+ <property name="openingDate" column="openingdate" type="date" />
+
+ <property name="closedDate" column="closeddate" type="date" />
+
+ <property name="active" not-null="true" />
+
+ <property name="comment" type="text" />
+
+ <property name="geoCode" />
+
+ <property name="featureType" />
+
+ <property name="coordinates" type="text" />
+
+ <property name="url" />
+
+ <property name="lastUpdated" />
+
<set name="groups" table="orgunitgroupmembers" inverse="true">
- <key column="organisationunitid"/>
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup" column="orgunitgroupid"/>
+ <key column="organisationunitid" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup" column="orgunitgroupid" />
</set>
-
+
<set name="users" table="usermembership" inverse="true">
- <key column="organisationunitid"/>
- <many-to-many class="org.hisp.dhis.user.User" column="userinfoid"/>
+ <key column="organisationunitid" />
+ <many-to-many class="org.hisp.dhis.user.User" column="userinfoid" />
</set>
-
- <!-- Contact info -->
-
- <property name="contactPerson" length="255"/>
-
- <property name="address" length="255"/>
-
- <property name="email" length="150"/>
-
- <property name="phoneNumber" length="150"/>
-
- <!-- hasPatients -->
-
- <property name="hasPatients"/>
-
+
+ <!-- Contact info -->
+
+ <property name="contactPerson" length="255" />
+
+ <property name="address" length="255" />
+
+ <property name="email" length="150" />
+
+ <property name="phoneNumber" length="150" />
+
+ <!-- hasPatients -->
+
+ <property name="hasPatients" />
+
</joined-subclass>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2010-01-15 11:32:18 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,28 +5,29 @@
<hibernate-mapping>
<class name="org.hisp.dhis.organisationunit.OrganisationUnitGroup" table="orgunitgroup">
+
<id name="id" column="orgunitgroupid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<property name="uuid">
- <column name="uuid" length="40"/>
+ <column name="uuid" length="40" />
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
+
<set name="members" table="orgunitgroupmembers">
- <key column="orgunitgroupid"/>
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="organisationunitid" foreign-key="fk_orgunitgroup_organisationunitid"/>
+ <key column="orgunitgroupid" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid"
+ foreign-key="fk_orgunitgroup_organisationunitid" />
</set>
-
+
<join table="orgunitgroupsetmembers" inverse="true">
- <key column="orgunitgroupid"/>
- <many-to-one column="orgunitgroupsetid" name="groupSet"/>
+ <key column="orgunitgroupid" />
+ <many-to-one column="orgunitgroupsetid" name="groupSet" />
</join>
-
+
</class>
</hibernate-mapping>
=== 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 2011-04-12 13:17:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,22 +5,23 @@
<hibernate-mapping>
<class name="org.hisp.dhis.organisationunit.OrganisationUnitGroupSet" table="orgunitgroupset">
+
<id name="id" column="orgunitgroupsetid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
- <property name="description"/>
- <property name="compulsory" not-null="true"/>
-
+ <property name="description" />
+ <property name="compulsory" not-null="true" />
+
<set name="organisationUnitGroups" table="orgunitgroupsetmembers">
- <key column="orgunitgroupsetid"/>
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup"
- column="orgunitgroupid" foreign-key="fk_orgunitgroupset_orgunitgroupid"/>
+ <key column="orgunitgroupsetid" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnitGroup" column="orgunitgroupid"
+ foreign-key="fk_orgunitgroupset_orgunitgroupid" />
</set>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitLevel.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitLevel.hbm.xml 2009-11-03 14:25:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitLevel.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,13 +5,14 @@
<hibernate-mapping>
<class name="org.hisp.dhis.organisationunit.OrganisationUnitLevel" table="orgunitlevel">
+
<id name="id" column="orgunitlevelid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="level" not-null="true" unique="true"/>
-
- <property name="name" not-null="true"/>
-
+ <property name="level" not-null="true" unique="true" />
+
+ <property name="name" not-null="true" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/Period.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/Period.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/Period.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,17 +4,18 @@
<hibernate-mapping>
<class name="org.hisp.dhis.period.Period" table="period">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="periodid">
- <generator class="native"/>
+ <generator class="native" />
</id>
<properties name="uniqueGroup" unique="true">
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" lazy="false"
- column="periodtypeid" foreign-key="fk_period_periodtypeid"/>
- <property name="startDate" type="date" not-null="true" column="startdate"/>
- <property name="endDate" type="date" not-null="true" column="enddate"/>
+ <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" lazy="false" column="periodtypeid"
+ foreign-key="fk_period_periodtypeid" />
+ <property name="startDate" type="date" not-null="true" column="startdate" />
+ <property name="endDate" type="date" not-null="true" column="enddate" />
</properties>
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/PeriodType.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/PeriodType.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/PeriodType.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,38 +5,27 @@
<hibernate-mapping>
<class name="org.hisp.dhis.period.PeriodType" table="periodtype">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="periodtypeid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
- <discriminator column="name" type="string" length="50" not-null="true"/>
-
- <subclass name="org.hisp.dhis.period.DailyPeriodType"
- discriminator-value="Daily"/>
- <subclass name="org.hisp.dhis.period.WeeklyPeriodType"
- discriminator-value="Weekly"/>
- <subclass name="org.hisp.dhis.period.MonthlyPeriodType"
- discriminator-value="Monthly"/>
- <subclass name="org.hisp.dhis.period.QuarterlyPeriodType"
- discriminator-value="Quarterly"/>
- <subclass name="org.hisp.dhis.period.SixMonthlyPeriodType"
- discriminator-value="SixMonthly"/>
- <subclass name="org.hisp.dhis.period.YearlyPeriodType"
- discriminator-value="Yearly"/>
- <subclass name="org.hisp.dhis.period.TwoYearlyPeriodType"
- discriminator-value="TwoYearly"/>
- <subclass name="org.hisp.dhis.period.OnChangePeriodType"
- discriminator-value="OnChange"/>
- <subclass name="org.hisp.dhis.period.SurveyPeriodType"
- discriminator-value="Survey"/>
- <subclass name="org.hisp.dhis.period.FinancialAprilPeriodType"
- discriminator-value="FinancialApril"/>
- <subclass name="org.hisp.dhis.period.FinancialJulyPeriodType"
- discriminator-value="FinancialJuly"/>
- <subclass name="org.hisp.dhis.period.FinancialOctoberPeriodType"
- discriminator-value="FinancialOct"/>
+
+ <discriminator column="name" type="string" length="50" not-null="true" />
+
+ <subclass name="org.hisp.dhis.period.DailyPeriodType" discriminator-value="Daily" />
+ <subclass name="org.hisp.dhis.period.WeeklyPeriodType" discriminator-value="Weekly" />
+ <subclass name="org.hisp.dhis.period.MonthlyPeriodType" discriminator-value="Monthly" />
+ <subclass name="org.hisp.dhis.period.QuarterlyPeriodType" discriminator-value="Quarterly" />
+ <subclass name="org.hisp.dhis.period.SixMonthlyPeriodType" discriminator-value="SixMonthly" />
+ <subclass name="org.hisp.dhis.period.YearlyPeriodType" discriminator-value="Yearly" />
+ <subclass name="org.hisp.dhis.period.TwoYearlyPeriodType" discriminator-value="TwoYearly" />
+ <subclass name="org.hisp.dhis.period.OnChangePeriodType" discriminator-value="OnChange" />
+ <subclass name="org.hisp.dhis.period.SurveyPeriodType" discriminator-value="Survey" />
+ <subclass name="org.hisp.dhis.period.FinancialAprilPeriodType" discriminator-value="FinancialApril" />
+ <subclass name="org.hisp.dhis.period.FinancialJulyPeriodType" discriminator-value="FinancialJuly" />
+ <subclass name="org.hisp.dhis.period.FinancialOctoberPeriodType" discriminator-value="FinancialOct" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sequence/hibernate/Sequence.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sequence/hibernate/Sequence.hbm.xml 2011-04-06 18:25:26 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sequence/hibernate/Sequence.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,14 +4,13 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
<class name="org.hisp.dhis.sequence.Sequence" table="systemsequence">
-
+
<id name="id" column="systemsequenceid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="currentValue" not-null="true"/>
+ <property name="currentValue" not-null="true" />
</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml 2011-04-03 10:25:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/source/hibernate/Source.hbm.xml 2011-04-12 13:25:06 +0000
@@ -2,21 +2,20 @@
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
+
<hibernate-mapping>
-
<class name="org.hisp.dhis.source.Source" table="source" abstract="true">
-
- <cache usage="read-write"/>
-
+
+ <cache usage="read-write" />
+
<id name="id" column="sourceid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<set name="dataSets" table="datasetsource" inverse="true">
- <key column="sourceid"/>
- <many-to-many class="org.hisp.dhis.dataset.DataSet" column="datasetid"/>
+ <key column="sourceid" />
+ <many-to-many class="org.hisp.dhis.dataset.DataSet" column="datasetid" />
</set>
-
+
</class>
-
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml 2010-05-11 14:20:51 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,16 +5,16 @@
<hibernate-mapping>
<class name="org.hisp.dhis.translation.Translation" table="translation">
- <cache usage="read-write"/>
-
+ <cache usage="read-write" />
+
<composite-id>
- <key-property name="className" column="objectclass" length="127"/>
- <key-property name="id" column="objectid"/>
- <key-property name="locale" column="locale" length="15"/>
- <key-property name="property" column="objectproperty" length="63"/>
+ <key-property name="className" column="objectclass" length="127" />
+ <key-property name="id" column="objectid" />
+ <key-property name="locale" column="locale" length="15" />
+ <key-property name="property" column="objectproperty" length="63" />
</composite-id>
- <property name="value" column="value" type="text" not-null="true"/>
-
+ <property name="value" column="value" type="text" 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/user/hibernate/User.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml 2011-03-31 16:28:24 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml 2011-04-12 13:25:06 +0000
@@ -6,25 +6,25 @@
<hibernate-mapping>
<class name="org.hisp.dhis.user.User" lazy="false" table="userinfo">
- <cache usage="read-write"/>
+ <cache usage="read-write" />
<id name="id" column="userinfoid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <property name="surname" not-null="true" length="160"/>
-
- <property name="firstName" not-null="true" length="160"/>
-
- <property name="email" length="160"/>
-
- <property name="phoneNumber" length="80"/>
-
- <set name="organisationUnits" table="usermembership">
- <key column="userinfoid"/>
- <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="organisationunitid" foreign-key="fk_userinfo_organisationunitid"/>
+ <property name="surname" not-null="true" length="160" />
+
+ <property name="firstName" not-null="true" length="160" />
+
+ <property name="email" length="160" />
+
+ <property name="phoneNumber" length="80" />
+
+ <set name="organisationUnits" table="usermembership">
+ <key column="userinfoid" />
+ <many-to-many class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid"
+ foreign-key="fk_userinfo_organisationunitid" />
</set>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -4,34 +4,32 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
- <class name="org.hisp.dhis.user.UserAuthorityGroup" table="userrole">
-
- <id name="id" column="userroleid">
- <generator class="native" />
- </id>
-
- <property name="name">
- <column name="name" not-null="true" unique="true" length="160" />
- </property>
-
- <property name="description" />
-
- <set name="members" table="userrolemembers" inverse="true">
- <key column="userroleid" />
- <many-to-many column="userid"
- class="org.hisp.dhis.user.UserCredentials" foreign-key="fk_userid" />
- </set>
-
- <set name="authorities" table="userroleauthorities">
- <key column="userroleid" />
- <element type="string" column="authority" />
- </set>
-
- <set name="dataSets" table="userroledataset">
- <key column="userroleid" />
- <many-to-many column="datasetid" class="org.hisp.dhis.dataset.DataSet"
- foreign-key="fk_datasetid" />
- </set>
-
- </class>
+ <class name="org.hisp.dhis.user.UserAuthorityGroup" table="userrole">
+
+ <id name="id" column="userroleid">
+ <generator class="native" />
+ </id>
+
+ <property name="name">
+ <column name="name" not-null="true" unique="true" length="160" />
+ </property>
+
+ <property name="description" />
+
+ <set name="members" table="userrolemembers" inverse="true">
+ <key column="userroleid" />
+ <many-to-many column="userid" class="org.hisp.dhis.user.UserCredentials" foreign-key="fk_userid" />
+ </set>
+
+ <set name="authorities" table="userroleauthorities">
+ <key column="userroleid" />
+ <element type="string" column="authority" />
+ </set>
+
+ <set name="dataSets" table="userroledataset">
+ <key column="userroleid" />
+ <many-to-many column="datasetid" class="org.hisp.dhis.dataset.DataSet" foreign-key="fk_datasetid" />
+ </set>
+
+ </class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml 2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,8 +5,8 @@
<hibernate-mapping>
<class name="org.hisp.dhis.user.UserCredentials" table="users">
-
- <cache usage="read-write"/>
+
+ <cache usage="read-write" />
<id name="id" column="userid">
<generator class="foreign">
@@ -14,22 +14,21 @@
</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" />
<property name="username">
- <column name="username" not-null="true" unique="true"/>
+ <column name="username" not-null="true" unique="true" />
</property>
-
+
<property name="password">
- <column name="password" not-null="true"/>
+ <column name="password" not-null="true" />
</property>
-
+
<set name="userAuthorityGroups" table="userrolemembers" cascade="save-update">
- <cache usage="read-write"/>
- <key column="userid"/>
- <many-to-many column="userroleid" class="org.hisp.dhis.user.UserAuthorityGroup"
- foreign-key="fk_userrolemembers_userroleid"/>
+ <cache usage="read-write" />
+ <key column="userid" />
+ <many-to-many column="userroleid" class="org.hisp.dhis.user.UserAuthorityGroup" foreign-key="fk_userrolemembers_userroleid" />
</set>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml 2010-12-16 18:00:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,18 +5,17 @@
<hibernate-mapping>
<class name="org.hisp.dhis.user.UserGroup" table="usergroup">
-
- <id name="id" column="usergroupid">
- <generator class="native"/>
+
+ <id name="id" column="usergroupid">
+ <generator class="native" />
</id>
- <property name="name" not-null="true" unique="true" length="230"/>
-
+ <property name="name" not-null="true" unique="true" length="230" />
+
<set name="members" table="usergroupmembers">
- <key column="usergroupid"/>
- <many-to-many column="userid"
- class="org.hisp.dhis.user.User" foreign-key="fk_usergroup_userid" />
+ <key column="usergroupid" />
+ <many-to-many column="userid" class="org.hisp.dhis.user.User" foreign-key="fk_usergroup_userid" />
</set>
-
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml 2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserSetting.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,15 +5,15 @@
<hibernate-mapping>
<class name="org.hisp.dhis.user.UserSetting" table="usersetting">
-
- <cache usage="read-write"/>
+
+ <cache usage="read-write" />
<composite-id>
- <key-many-to-one name="user" class="org.hisp.dhis.user.User" column="userinfoid"/>
- <key-property name="name" column="name"/>
+ <key-many-to-one name="user" class="org.hisp.dhis.user.User" column="userinfoid" />
+ <key-property name="name" column="name" />
</composite-id>
- <property name="value" type="serializable" length="65535"/>
+ <property name="value" type="serializable" length="65535" />
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml 2010-05-04 01:56:24 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,24 +5,24 @@
<hibernate-mapping>
<class name="org.hisp.dhis.validation.ValidationCriteria" table="validationcriteria">
+
<id name="id" column="validationcriteriaid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
- <property name="description"/>
-
- <property name="property"/>
-
+
+ <property name="description" />
+
+ <property name="property" />
+
<property name="operator">
- <column name="operator" not-null="true" unique="false"/>
+ <column name="operator" not-null="true" unique="false" />
</property>
-
- <property name="value" type="serializable" length="65535"/>
-
+
+ <property name="value" type="serializable" length="65535" />
+
</class>
-
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2010-12-29 10:06:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2011-04-12 13:25:06 +0000
@@ -5,37 +5,36 @@
<hibernate-mapping>
<class name="org.hisp.dhis.validation.ValidationRule" table="validationrule">
+
<id name="id" column="validationruleid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
- <property name="description" type="text"/>
-
- <property name="type"/>
-
+
+ <property name="description" type="text" />
+
+ <property name="type" />
+
<property name="operator" type="org.hisp.dhis.expression.OperatorUserType">
- <column name="operator" not-null="true" unique="false"/>
+ <column name="operator" not-null="true" unique="false" />
</property>
- <many-to-one name="leftSide" column="leftexpressionid"
- class="org.hisp.dhis.expression.Expression" cascade="all"/>
-
- <many-to-one name="rightSide" column="rightexpressionid"
- class="org.hisp.dhis.expression.Expression" cascade="all"/>
-
+ <many-to-one name="leftSide" column="leftexpressionid" class="org.hisp.dhis.expression.Expression"
+ cascade="all" />
+
+ <many-to-one name="rightSide" column="rightexpressionid" class="org.hisp.dhis.expression.Expression"
+ cascade="all" />
+
<set name="groups" table="validationrulegroupmembers" inverse="true">
- <key column="validationruleid"/>
- <many-to-many class="org.hisp.dhis.validation.ValidationRuleGroup" column="validationgroupid"/>
+ <key column="validationruleid" />
+ <many-to-many class="org.hisp.dhis.validation.ValidationRuleGroup" column="validationgroupid" />
</set>
-
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType"
- column="periodtypeid"
- foreign-key="fk_validationrule_periodtypeid" />
-
+
+ <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" column="periodtypeid"
+ foreign-key="fk_validationrule_periodtypeid" />
+
</class>
-
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml 2009-08-31 15:37:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml 2011-04-12 13:25:06 +0000
@@ -6,19 +6,19 @@
<hibernate-mapping>
<class name="org.hisp.dhis.validation.ValidationRuleGroup" table="validationrulegroup">
<id name="id" column="validationgroupid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="230"/>
+ <column name="name" not-null="true" unique="true" length="230" />
</property>
-
- <property name="description" type="text"/>
-
+
+ <property name="description" type="text" />
+
<set name="members" table="validationrulegroupmembers">
- <key column="validationgroupid"/>
- <many-to-many class="org.hisp.dhis.validation.ValidationRule"
- column="validationruleid" foreign-key="fk_validationrulegroup_validationruleid"/>
+ <key column="validationgroupid" />
+ <many-to-many class="org.hisp.dhis.validation.ValidationRule" column="validationruleid"
+ foreign-key="fk_validationrulegroup_validationruleid" />
</set>
</class>
