dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11630
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3370: added not-null="true" for int/boolean primitives in dhis-service-mapping (and formatting..)
------------------------------------------------------------
revno: 3370
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-04-12 15:38:03 +0200
message:
added not-null="true" for int/boolean primitives in dhis-service-mapping (and formatting..)
modified:
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.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-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml 2011-02-02 16:34:41 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLayer.hbm.xml 2011-04-12 13:38:03 +0000
@@ -4,29 +4,27 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <class name="org.hisp.dhis.mapping.MapLayer" table="maplayer">
-
- <id name="id" column="maplayerid">
- <generator class="native"/>
- </id>
-
- <property name="name" column="name" unique="true"/>
-
- <property name="type" column="type"/>
-
- <property name="mapSource" column="mapsource"/>
-
- <property name="layer" column="layer"/>
-
- <property name="fillColor" column="fillcolor"/>
-
- <property name="fillOpacity" column="fillopacity"/>
-
- <property name="strokeColor" column="strokecolor"/>
-
- <property name="strokeWidth" column="strokewidth"/>
-
- </class>
-
-</hibernate-mapping>
\ No newline at end of file
+ <class name="org.hisp.dhis.mapping.MapLayer" table="maplayer">
+
+ <id name="id" column="maplayerid">
+ <generator class="native" />
+ </id>
+
+ <property name="name" column="name" unique="true" />
+
+ <property name="type" column="type" />
+
+ <property name="mapSource" column="mapsource" />
+
+ <property name="layer" column="layer" />
+
+ <property name="fillColor" column="fillcolor" />
+
+ <property name="fillOpacity" column="fillopacity" not-null="true" />
+
+ <property name="strokeColor" column="strokecolor" />
+
+ <property name="strokeWidth" column="strokewidth" not-null="true" />
+
+ </class>
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml 2010-03-25 15:27:40 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegend.hbm.xml 2011-04-12 13:38:03 +0000
@@ -4,21 +4,19 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <class name="org.hisp.dhis.mapping.MapLegend" table="maplegend">
-
- <id name="id" column="maplegendid">
- <generator class="native"/>
- </id>
-
- <property name="name" column="name" unique="true"/>
-
- <property name="startValue" column="startvalue"/>
-
- <property name="endValue" column="endvalue"/>
-
- <property name="color" column="color"/>
-
- </class>
-
-</hibernate-mapping>
\ No newline at end of file
+ <class name="org.hisp.dhis.mapping.MapLegend" table="maplegend">
+
+ <id name="id" column="maplegendid">
+ <generator class="native" />
+ </id>
+
+ <property name="name" column="name" unique="true" />
+
+ <property name="startValue" column="startvalue" />
+
+ <property name="endValue" column="endvalue" />
+
+ <property name="color" column="color" />
+
+ </class>
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml 2010-09-09 19:19:51 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapLegendSet.hbm.xml 2011-04-12 13:38:03 +0000
@@ -4,43 +4,38 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <class name="org.hisp.dhis.mapping.MapLegendSet" table="maplegendset">
-
- <id name="id" column="maplegendsetid">
- <generator class="native"/>
- </id>
-
- <property name="name" column="name" unique="true"/>
-
- <property name="type" column="type"/>
-
- <property name="method" column="method"/>
-
- <property name="classes" column="classes"/>
-
- <property name="colorLow" column="colorlow"/>
-
- <property name="colorHigh" column="colorhigh"/>
-
- <set name="mapLegends" table="maplegendsetmaplegend">
- <key column="legendsetid"/>
- <many-to-many column="maplegendid"
- class="org.hisp.dhis.mapping.MapLegend" foreign-key="fk_maplegendset_maplegend"/>
- </set>
-
- <set name="indicators" table="maplegendsetindicator">
- <key column="legendsetid"/>
- <many-to-many column="indicatorid"
- class="org.hisp.dhis.indicator.Indicator" foreign-key="fk_maplegendset_indicator"/>
- </set>
-
- <set name="dataElements" table="maplegendsetdataelement">
- <key column="legendsetid"/>
- <many-to-many column="dataelementid"
- class="org.hisp.dhis.dataelement.DataElement" foreign-key="fk_maplegendset_dataelement"/>
- </set>
-
- </class>
-
-</hibernate-mapping>
\ No newline at end of file
+ <class name="org.hisp.dhis.mapping.MapLegendSet" table="maplegendset">
+
+ <id name="id" column="maplegendsetid">
+ <generator class="native" />
+ </id>
+
+ <property name="name" column="name" unique="true" />
+
+ <property name="type" column="type" />
+
+ <property name="method" column="method" not-null="true" />
+
+ <property name="classes" column="classes" not-null="true" />
+
+ <property name="colorLow" column="colorlow" />
+
+ <property name="colorHigh" column="colorhigh" />
+
+ <set name="mapLegends" table="maplegendsetmaplegend">
+ <key column="legendsetid" />
+ <many-to-many column="maplegendid" class="org.hisp.dhis.mapping.MapLegend" foreign-key="fk_maplegendset_maplegend" />
+ </set>
+
+ <set name="indicators" table="maplegendsetindicator">
+ <key column="legendsetid" />
+ <many-to-many column="indicatorid" class="org.hisp.dhis.indicator.Indicator" foreign-key="fk_maplegendset_indicator" />
+ </set>
+
+ <set name="dataElements" table="maplegendsetdataelement">
+ <key column="legendsetid" />
+ <many-to-many column="dataelementid" class="org.hisp.dhis.dataelement.DataElement" foreign-key="fk_maplegendset_dataelement" />
+ </set>
+
+ </class>
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml 2011-01-26 00:07:38 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml 2011-04-12 13:38:03 +0000
@@ -4,77 +4,73 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
<hibernate-mapping>
-
- <class name="org.hisp.dhis.mapping.MapView" table="mapview">
-
- <id name="id" column="mapviewid">
- <generator class="native"/>
- </id>
-
- <property name="name"/>
-
- <many-to-one name="user" class="org.hisp.dhis.user.User"
- column="userid" foreign-key="fk_mapview_userid"/>
-
- <property name="featureType"/>
-
- <property name="mapValueType"/>
-
- <many-to-one name="indicatorGroup" class="org.hisp.dhis.indicator.IndicatorGroup"
- column="indicatorgroupid" foreign-key="fk_mapview_indicatorgroupid"/>
-
- <many-to-one name="indicator" class="org.hisp.dhis.indicator.Indicator"
- column="indicatorid" foreign-key="fk_mapview_indicatorid"/>
-
- <many-to-one name="dataElementGroup" class="org.hisp.dhis.dataelement.DataElementGroup"
- column="dataelementgroupid" foreign-key="fk_mapview_dataelementgroupid"/>
-
- <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement"
- column="dataelementid" foreign-key="fk_mapview_dataelementid"/>
-
- <property name="mapDateType"/>
-
- <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType"
- column="periodtypeid" foreign-key="fk_mapview_periodtypeid"/>
-
- <many-to-one name="period" class="org.hisp.dhis.period.Period"
- column="periodid" foreign-key="fk_mapview_periodid"/>
-
- <property name="startDate"/>
-
- <property name="endDate"/>
-
- <many-to-one name="parentOrganisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit"
- column="parentorganisationunitid" foreign-key="fk_mapview_parentorganisationunitid"/>
-
- <many-to-one name="organisationUnitLevel" class="org.hisp.dhis.organisationunit.OrganisationUnitLevel"
- column="organisationunitlevelid" foreign-key="fk_mapview_organisationunitlevelid"/>
-
- <property name="mapLegendType"/>
-
- <property name="method"/>
-
- <property name="classes"/>
-
- <property name="bounds"/>
-
- <property name="colorLow"/>
-
- <property name="colorHigh"/>
-
- <many-to-one name="mapLegendSet" class="org.hisp.dhis.mapping.MapLegendSet"
- column="maplegendsetid" foreign-key="fk_mapview_maplegendsetid"/>
-
- <property name="radiusLow"/>
-
- <property name="radiusHigh"/>
-
- <property name="longitude"/>
-
- <property name="latitude"/>
-
- <property name="zoom"/>
-
- </class>
-
-</hibernate-mapping>
\ No newline at end of file
+ <class name="org.hisp.dhis.mapping.MapView" table="mapview">
+
+ <id name="id" column="mapviewid">
+ <generator class="native" />
+ </id>
+
+ <property name="name" />
+
+ <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_mapview_userid" />
+
+ <property name="featureType" />
+
+ <property name="mapValueType" />
+
+ <many-to-one name="indicatorGroup" class="org.hisp.dhis.indicator.IndicatorGroup" column="indicatorgroupid"
+ foreign-key="fk_mapview_indicatorgroupid" />
+
+ <many-to-one name="indicator" class="org.hisp.dhis.indicator.Indicator" column="indicatorid"
+ foreign-key="fk_mapview_indicatorid" />
+
+ <many-to-one name="dataElementGroup" class="org.hisp.dhis.dataelement.DataElementGroup" column="dataelementgroupid"
+ foreign-key="fk_mapview_dataelementgroupid" />
+
+ <many-to-one name="dataElement" class="org.hisp.dhis.dataelement.DataElement" column="dataelementid"
+ foreign-key="fk_mapview_dataelementid" />
+
+ <property name="mapDateType" />
+
+ <many-to-one name="periodType" class="org.hisp.dhis.period.PeriodType" column="periodtypeid"
+ foreign-key="fk_mapview_periodtypeid" />
+
+ <many-to-one name="period" class="org.hisp.dhis.period.Period" column="periodid" foreign-key="fk_mapview_periodid" />
+
+ <property name="startDate" />
+
+ <property name="endDate" />
+
+ <many-to-one name="parentOrganisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit"
+ column="parentorganisationunitid" foreign-key="fk_mapview_parentorganisationunitid" />
+
+ <many-to-one name="organisationUnitLevel" class="org.hisp.dhis.organisationunit.OrganisationUnitLevel"
+ column="organisationunitlevelid" foreign-key="fk_mapview_organisationunitlevelid" />
+
+ <property name="mapLegendType" />
+
+ <property name="method" />
+
+ <property name="classes" />
+
+ <property name="bounds" />
+
+ <property name="colorLow" />
+
+ <property name="colorHigh" />
+
+ <many-to-one name="mapLegendSet" class="org.hisp.dhis.mapping.MapLegendSet" column="maplegendsetid"
+ foreign-key="fk_mapview_maplegendsetid" />
+
+ <property name="radiusLow" />
+
+ <property name="radiusHigh" />
+
+ <property name="longitude" />
+
+ <property name="latitude" />
+
+ <property name="zoom" />
+
+ </class>
+</hibernate-mapping>
