Downloads Documentation Community 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/Field.hbm.xml

    r4295 r4969  
    1818 
    1919                <property name="name" type="java.lang.String" 
    20                         column="name" length="255" not-null="true"/> 
     20                        length="255" not-null="true"/> 
    2121                 
    22                 <property name="description" type="java.lang.String" 
    23                         column="description" length="65535" /> 
     22                <property name="description" type="java.lang.String" length="65535" /> 
    2423 
    2524                <many-to-one name="fieldType" class="FieldType" not-null="true"> 
     
    2726                </many-to-one> 
    2827 
    29                 <many-to-one name="concept" class="Concept"> 
    30                         <column name="concept_id" /> 
    31                 </many-to-one> 
     28                <many-to-one name="concept" class="Concept" column="concept_id" /> 
    3229                 
    3330                <property name="tableName" type="java.lang.String" 
     
    4340                        column="select_multiple" length="1" not-null="true"/> 
    4441                 
    45                 <many-to-one name="creator" class="User" not-null="true"> 
    46                         <column name="creator" /> 
    47                 </many-to-one> 
     42                <many-to-one name="creator" class="User" not-null="true" /> 
    4843 
    4944                <property name="dateCreated" type="java.util.Date" 
     
    6964                </set> 
    7065                 
     66                <many-to-one name="retiredBy" class="org.openmrs.User" 
     67                        column="retired_by" /> 
     68                <property name="dateRetired" type="java.util.Date" 
     69                        column="date_retired" length="19" /> 
     70                <property name="retireReason" type="java.lang.String" 
     71                        column="retire_reason" length="255" /> 
     72                <property name="retired" type="boolean" length="1" 
     73                        not-null="true" /> 
     74                 
    7175        </class> 
    7276</hibernate-mapping>