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

[Julien Viet]

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

  Modified:    migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal 
                        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       +11 -17    jboss-portal/migration/src/resources/portal-migration-war/WEB-INF/classes/schema24/portal/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/portal/domain.hbm.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- domain.hbm.xml	7 Jul 2006 07:30:49 -0000	1.4
  +++ domain.hbm.xml	15 Jul 2006 12:49:19 -0000	1.5
  @@ -17,16 +17,14 @@
         </id>
         <property
               name="path"
  +            column="PATH"
               type="org.jboss.portal.migration.helper.MagicString"
               not-null="true"
  -            unique="true">
  -         <column name="PATH"/>
  -      </property>
  +            unique="true"/>
         <property
               name="name"
  -            not-null="true">
  -         <column name="NAME"/>
  -      </property>
  +            column="NAME"
  +            not-null="true"/>
         <map
               name="children"
               inverse="true"
  @@ -41,11 +39,10 @@
         </map>
         <many-to-one
               name="parent"
  +            column="PARENT_KEY"
               not-null="false"
               cascade="none"
  -            fetch="select">
  -         <column name="PARENT_KEY"/>
  -      </many-to-one>
  +            fetch="select"/>
         <one-to-one
               name="object"
               class="org.jboss.portal.migration.model24.portal.PortalObject24Impl"
  @@ -151,18 +148,16 @@
            name="org.jboss.portal.migration.model24.portal.ObjectNodeSecurityConstraint"
            table="JBP_OBJECT_NODE_SEC">
         <!--<cache usage="read-write"/>-->
  -      <id name="key">
  -         <column name="PK"/>
  +      <id name="key" column="PK">
            <generator class="native">
               <param name="sequence">sec_seq</param>
            </generator>
         </id>
         <property
               name="role"
  +            column="ROLE"
               not-null="true"
  -            unique="false">
  -         <column name="ROLE"/>
  -      </property>
  +            unique="false"/>
         <set
               name="actions"
               table="JBP_OBJECT_NODE_SEC_ACTIONS"
  @@ -173,10 +168,9 @@
         </set>
         <many-to-one
               name="objectNode"
  +            column="NODE_KEY"
               class="org.jboss.portal.migration.model24.portal.ObjectNode24"
               cascade="none"
  -            fetch="select">
  -         <column name="NODE_KEY"/>
  -      </many-to-one>
  +            fetch="select"/>
      </class>
   </hibernate-mapping>