Downloads Documentation Community
Contribute
Contribute Demo






Show Sidebar
Login | Register


Show
Ignore:
Timestamp:
07/17/08 15:20:10 (6 months ago)
Author:
catullus
Message:

sync-bidrectional: partly merge

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openmrs/branches/data_synchronization_bidirectional

    • Property svn:ignore changed from
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      to
      build*
      dist*
      ${env.CATALINA_HOME}
      docs
      .metadata
      setup.inf
      setup.rpt
      *.iws
      *.ipr
      *.iml

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

    r4295 r4969  
    88        <class name="ConceptDatatype" table="concept_datatype"> 
    99 
    10                 <id name="conceptDatatypeId" type="java.lang.Integer"  
     10                <id name="conceptDatatypeId" type="java.lang.Integer" 
    1111                        column="concept_datatype_id" unsaved-value="0"> 
    1212                        <generator class="native" /> 
    …… 
    1818                        column="guid" length="36" /> 
    1919 
    20                 <property name="name" type="java.lang.String"  
    21                         column="name" not-null="true" length="255" /> 
     20                <property name="name" type="java.lang.String" not-null="true" 
     21                        length="255" /> 
    2222 
    23                 <property name="description" type="java.lang.String"  
    24                         column="description" not-null="true" length="255" /> 
     23                <property name="description" type="java.lang.String" 
     24                        not-null="true" length="255" /> 
    2525 
    26                 <property name="dateCreated" type="java.util.Date"  
     26                <property name="dateCreated" type="java.util.Date" 
    2727                        column="date_created" not-null="true" length="19" /> 
    2828 
    29                 <property name="hl7Abbreviation" type="java.lang.String"  
     29                <property name="hl7Abbreviation" type="java.lang.String" 
    3030                        column="hl7_abbreviation" not-null="false" length="3" /> 
    31                  
    32                 <!-- bi-directional many-to-one association to User --> 
    33                 <many-to-one name="creator" class="User" not-null="true"> 
    34                         <column name="creator" /> 
    35                 </many-to-one> 
     31 
     32                <many-to-one name="creator" class="User" not-null="true" /> 
     33 
     34                <many-to-one name="retiredBy" class="org.openmrs.User" 
     35                        column="retired_by" /> 
     36                <property name="dateRetired" type="java.util.Date" 
     37                        column="date_retired" length="19" /> 
     38                <property name="retireReason" type="java.lang.String" 
     39                        column="retire_reason" length="255" /> 
     40                <property name="retired" type="boolean" length="1" 
     41                        not-null="true" /> 
    3642 
    3743        </class>