[jboss-cvs] jboss-portal/core/src/resources/portal-core-sar/conf/hibernate/portal ...

[Julien Viet]

  User: julien  
  Date: 06/07/15 04:55:07

  Modified:    core/src/resources/portal-core-sar/conf/hibernate/portal 
                        domain.hbm.xml
  Log:
  JBPORTAL-960 : Hibernate domain configuration files do not declare properly the column constraints
  
  Revision  Changes    Path
  1.25      +10 -15    jboss-portal/core/src/resources/portal-core-sar/conf/hibernate/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/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- domain.hbm.xml	23 Jun 2006 16:40:56 -0000	1.24
  +++ domain.hbm.xml	15 Jul 2006 08:55:07 -0000	1.25
  @@ -17,16 +17,14 @@
         </id>
         <property
            name="path"
  +         column="PATH"
            type="org.jboss.portal.core.hibernate.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.core.impl.model.portal.PortalObjectImpl"
  @@ -160,10 +157,9 @@
         </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"
  @@ -174,10 +170,9 @@
         </set>
         <many-to-one
            name="objectNode"
  +         column="NODE_KEY"
            class="org.jboss.portal.core.impl.model.portal.ObjectNode"
            cascade="none"
  -         fetch="select">
  -         <column name="NODE_KEY"/>
  -      </many-to-one>
  +         fetch="select"/>
      </class>
   </hibernate-mapping>