OpenMRS

Timestamp:

07/17/08 15:20:10 (6 months ago)

Author:

catullus

Message:

sync-bidrectional: partly merge

Files:

• openmrs/branches/data_synchronization_bidirectional (modified) (1 prop)
• openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/ConceptName.hbm.xml (modified) (3 diffs)

openmrs/branches/data_synchronization_bidirectional/metadata/api/hibernate/org/openmrs/api/db/hibernate/ConceptName.hbm.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
-0
+1
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-
@@ -8 +8 @@
-        <class name="ConceptName" table="concept_name" batch-size="25">
-
-java.lang.Integer
+int
-                        <generator class="native" />
-                </id>
@@ -15 +15 @@
-                        name="concept"
-                        column="concept_id"
-
-
+
-
-25
+6553
-                <property name="locale" type="java.util.Locale" length="50" not-null="true"/>
-                <property name="shortName" type="java.lang.String" length="255" column="short_name" />
-                <property name="description" type="java.lang.String" length="65535" not-null="true" />
-                
-                <property name="dateCreated" type="java.util.Date" column="date_created" not-null="true"/>
-                <many-to-one name="creator" class="User" column="creator" not-null="true"/>
-
-
+
+
+
+
-        </class>
-