dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11626
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3366: xml formatting cleanup in dhis-service-administration
------------------------------------------------------------
revno: 3366
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-04-12 15:31:21 +0200
message:
xml formatting cleanup in dhis-service-administration
modified:
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/datalock/hibernate/DataSetLock.hbm.xml
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/hibernate/SqlView.hbm.xml
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/useraudit/hibernate/LoginFailure.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-administration/src/main/resources/org/hisp/dhis/datalock/hibernate/DataSetLock.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/datalock/hibernate/DataSetLock.hbm.xml 2009-09-10 13:17:59 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/datalock/hibernate/DataSetLock.hbm.xml 2011-04-12 13:31:21 +0000
@@ -5,25 +5,25 @@
<hibernate-mapping>
<class name="org.hisp.dhis.datalock.DataSetLock" table="datasetlock">
+
<id name="id" column="datasetlockid">
- <generator class="native"/>
+ <generator class="native" />
</id>
- <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" lazy="false"
- column="datasetid" not-null="true" foreign-key="fk_dataset_datasetid"/>
-
- <many-to-one name="period" class="org.hisp.dhis.period.Period" lazy="false"
- column="periodid" not-null="true" foreign-key="fk_dataset_periodid"/>
-
+ <many-to-one name="dataSet" class="org.hisp.dhis.dataset.DataSet" lazy="false" column="datasetid"
+ not-null="true" foreign-key="fk_dataset_datasetid" />
+
+ <many-to-one name="period" class="org.hisp.dhis.period.Period" lazy="false" column="periodid" not-null="true"
+ foreign-key="fk_dataset_periodid" />
+
<set name="sources" table="datasetlocksource">
- <key column="datasetlockid"/>
- <many-to-many column="sourceid"
- class="org.hisp.dhis.source.Source"/>
+ <key column="datasetlockid" />
+ <many-to-many column="sourceid" class="org.hisp.dhis.source.Source" />
</set>
-
- <property name="storedBy" column="storedby" length="31"/>
-
- <property name="timestamp" column="lastupdated" type="date"/>
-
+
+ <property name="storedBy" column="storedby" length="31" />
+
+ <property name="timestamp" column="lastupdated" type="date" />
+
</class>
</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/hibernate/SqlView.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/hibernate/SqlView.hbm.xml 2010-08-19 09:25:55 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/hibernate/SqlView.hbm.xml 2011-04-12 13:31:21 +0000
@@ -4,21 +4,19 @@
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
-
<class name="org.hisp.dhis.sqlview.SqlView" table="sqlview">
-
+
<id name="id" column="viewid">
- <generator class="native"/>
+ <generator class="native" />
</id>
-
+
<property name="name">
- <column name="name" not-null="true" unique="true" length="50"/>
+ <column name="name" not-null="true" unique="true" length="50" />
</property>
-
- <property name="description" type="text"/>
-
- <property name="sqlQuery" not-null="true" type="text"/>
+
+ <property name="description" type="text" />
+
+ <property name="sqlQuery" not-null="true" type="text" />
</class>
-
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/useraudit/hibernate/LoginFailure.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/useraudit/hibernate/LoginFailure.hbm.xml 2010-03-06 17:02:42 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/useraudit/hibernate/LoginFailure.hbm.xml 2011-04-12 13:31:21 +0000
@@ -5,10 +5,14 @@
<hibernate-mapping>
<class name="org.hisp.dhis.useraudit.LoginFailure" table="loginfailure">
+
<id name="id" column="loginfailureid">
- <generator class="native"/>
- </id>
- <property name="username"/>
- <property name="date"/>
+ <generator class="native" />
+ </id>
+
+ <property name="username" />
+
+ <property name="date" />
+
</class>
</hibernate-mapping>