[jboss-cvs] jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/instance ...

[Julien Viet]

  User: julien  
  Date: 06/07/15 08:49:19

  Modified:    migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/instance 
                        domain.hbm.xml
  Log:
  JBPORTAL-960 : Hibernate domain configuration files do not declare properly the column constraints
  for the migration app as well
  
  Revision  Changes    Path
  1.5       +8 -13     jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/instance/domain.hbm.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: domain.hbm.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/instance/domain.hbm.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- domain.hbm.xml	13 Jun 2006 12:17:07 -0000	1.4
  +++ domain.hbm.xml	15 Jul 2006 12:49:19 -0000	1.5
  @@ -7,8 +7,7 @@
            name="org.jboss.portal.migration.model24.instance.Instance24Impl"
            table="JBP_INSTANCE">
         <!--<cache usage="read-write"/>-->
  -      <id name="key" access="field">
  -         <column name="PK"/>
  +      <id name="key" access="field" column="PK">
            <generator class="native">
               <param name="sequence">instance_seq</param>
            </generator>
  @@ -61,19 +60,17 @@
            name="org.jboss.portal.migration.model24.instance.UserInstance24"
            table="JBP_INSTANCE_PER_USER">
         <!--<cache usage="read-write"/>-->
  -      <id name="key" access="field">
  -         <column name="PK"/>
  +      <id name="key" access="field" column="PK">
            <generator class="native">
               <param name="sequence">instance_seq</param>
            </generator>
         </id>
         <many-to-one
               name="instance"
  +            column="INSTANCE_PK"
               class="org.jboss.portal.migration.model24.instance.Instance24Impl"
               cascade="none"
  -            fetch="select">
  -         <column name="INSTANCE_PK"/>
  -      </many-to-one>
  +            fetch="select"/>
         <property
               name="userId"
               not-null="true"
  @@ -106,10 +103,9 @@
         </id>
         <property
               name="role"
  +            column="ROLE"
               not-null="true"
  -            unique="false">
  -         <column name="ROLE"/>
  -      </property>
  +            unique="false"/>
         <set
               name="actions"
               table="JBP_INSTANCE_SECURITY_ACTIONS"
  @@ -120,10 +116,9 @@
         </set>
         <many-to-one
               name="instance"
  +            column="INSTANCE_PK"
               class="org.jboss.portal.migration.model24.instance.Instance24Impl"
               cascade="none"
  -            fetch="select">
  -         <column name="INSTANCE_PK"/>
  -      </many-to-one>
  +            fetch="select"/>
      </class>
   </hibernate-mapping>