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/OrderType.hbm.xml

    r4295 r4969  
    1212                        <generator class="native" /> 
    1313                </id> 
    14  
     14                 
    1515                <discriminator column="order_type_id" insert="false" /> 
    1616 
    …… 
    1818                        column="guid" length="36" /> 
    1919 
    20                 <property name="name" type="java.lang.String" column="name" 
     20                <property name="name" type="java.lang.String"  
    2121                        not-null="true" length="255" /> 
    2222                <property name="description" type="java.lang.String" 
    23                         column="description" not-null="true" length="255" /> 
     23                        not-null="true" length="255" /> 
    2424                <property name="dateCreated" type="java.util.Date" 
    2525                        column="date_created" not-null="true" length="19" /> 
    2626 
    27                 <!-- Associations --> 
    28  
    29                 <!-- bi-directional many-to-one association to User --> 
    30                 <many-to-one name="creator" class="User" not-null="true"> 
    31                         <column name="creator" /> 
    32                 </many-to-one> 
    33                 <!-- bi-directional one-to-many association to Order --> 
    34                 <!-- 
    35                 <set name="orders" lazy="true" inverse="true" cascade="all"> 
    36                         <key column="order_type_id" /> 
    37                         <one-to-many class="Order" /> 
    38                 </set> 
    39                 --> 
     27                <many-to-one name="creator" class="User" not-null="true" /> 
     28                 
     29                <many-to-one name="retiredBy" class="User" column="retired_by" /> 
     30                <property name="dateRetired" type="java.util.Date" 
     31                        column="date_retired" length="19" /> 
     32                <property name="retireReason" type="java.lang.String" 
     33                        column="retire_reason" length="255" /> 
     34                <property name="retired" type="boolean" column="retired" 
     35                        length="1" not-null="true" /> 
    4036 
    4137        </class>