[Nextobjects-devel] nextobjects/nextobjects/sample videoclub.cdm,1.7,1.8

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/nextobjects/nextobjects/nextobjects/sample
In directory sc8-pr-cvs1:/tmp/cvs-serv12214/sample

Modified Files:
	videoclub.cdm 
Log Message:
Fixed major bug in merise transform.


Index: videoclub.cdm
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/sample/videoclub.cdm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** videoclub.cdm	6 Apr 2003 14:19:28 -0000	1.7
--- videoclub.cdm	25 May 2003 08:02:35 -0000	1.8
***************
*** 18,24 ****
          <databasePassword />
      </databaseProperties>
!     <inheritanceLink childClass="Director" parentClass="People" />
!     <inheritanceLink childClass="Actor" parentClass="People" />
!     <entity name="Movie" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5391" y="2645" width="71" height="124">
          <code>Movie</code>
          <notes />
--- 18,22 ----
          <databasePassword />
      </databaseProperties>
!     <entity name="Movie" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5420" y="2639" width="71" height="139">
          <code>Movie</code>
          <notes />
***************
*** 32,41 ****
          <column name="comments" javaName="" code="COMMENTS" primaryKey="false" required="true" type="VARCHAR" javaType="primitive" size="255" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="CATEGORIES" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5039" y="2765" width="92" height="33">
          <code>CATEGORIES</code>
          <notes />
          <column name="categorieid" javaName="" code="CATEGORIEID" primaryKey="true" required="true" type="INTEGER" javaType="primitive" size="" default="" autoIncrement="true" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Tape" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5212" y="2512" width="57" height="46">
          <code>Tape</code>
          <notes />
--- 30,41 ----
          <column name="comments" javaName="" code="COMMENTS" primaryKey="false" required="true" type="VARCHAR" javaType="primitive" size="255" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="CATEGORIES" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5165" y="2702" width="92" height="48">
          <code>CATEGORIES</code>
          <notes />
          <column name="categorieid" javaName="" code="CATEGORIEID" primaryKey="true" required="true" type="INTEGER" javaType="primitive" size="" default="" autoIncrement="true" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
+         <column name="Item 1" javaName="" code="ITEM_1" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="255" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
+         <column name="Item 2" javaName="" code="ITEM_2" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="255" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Tape" javaName="" idMethod="none" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5232" y="2527" width="57" height="61">
          <code>Tape</code>
          <notes />
***************
*** 43,47 ****
          <column name="dispo" javaName="" code="dispo" primaryKey="false" required="false" type="BOOLEANCHAR" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="CUSTORMER" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5652" y="2541" width="85" height="46">
          <code>CUSTORMER</code>
          <notes />
--- 43,47 ----
          <column name="dispo" javaName="" code="dispo" primaryKey="false" required="false" type="BOOLEANCHAR" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="CUSTORMER" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5547" y="2566" width="85" height="61">
          <code>CUSTORMER</code>
          <notes />
***************
*** 49,58 ****
          <column name="name" javaName="" code="NAME" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="32" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Actor" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="org.devaki.nextobjects.sample.Base" basePeer="org.devaki.nextobjects.sample.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5606" y="2835" width="64" height="33">
          <code>Actor</code>
          <notes />
          <column name="actorid" javaName="" code="ACTORID" primaryKey="true" required="true" type="INTEGER" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Director" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="org.devaki.nextobjects.sample.Base" basePeer="org.devaki.nextobjects.sample.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5291" y="2887" width="85" height="46">
          <code>Director</code>
          <notes />
--- 49,58 ----
          <column name="name" javaName="" code="NAME" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="32" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Actor" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="org.devaki.nextobjects.sample.Base" basePeer="org.devaki.nextobjects.sample.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5606" y="2835" width="64" height="48">
          <code>Actor</code>
          <notes />
          <column name="actorid" javaName="" code="ACTORID" primaryKey="true" required="true" type="INTEGER" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="Director" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="org.devaki.nextobjects.sample.Base" basePeer="org.devaki.nextobjects.sample.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5312" y="2878" width="85" height="61">
          <code>Director</code>
          <notes />
***************
*** 60,72 ****
          <column name="biography" javaName="" code="biography" primaryKey="false" required="false" type="CLOB" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <entity name="People" javaName="" idMethod="none" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5470" y="2901" width="78" height="72">
!         <code>People</code>
!         <notes />
!         <column name="peopleid" javaName="" code="peopleid" primaryKey="true" required="true" type="INTEGER" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
!         <column name="firstname" javaName="" code="firstname" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="32" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
!         <column name="lastname" javaName="" code="lastname" primaryKey="false" required="false" type="VARCHAR" javaType="primitive" size="32" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
!         <column name="birthdate" javaName="" code="birthdate" primaryKey="false" required="false" type="DATE" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
!     </entity>
!     <association name="HAVE_DIRECTED" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5070" y="2830" width="106" height="20">
          <code>HAVE_DIRECTED</code>
          <notes />
--- 60,64 ----
          <column name="biography" javaName="" code="biography" primaryKey="false" required="false" type="CLOB" javaType="primitive" size="" default="" autoIncrement="false" inheritance="false" inputValidator="" javaNamingMethod="null" description="" />
      </entity>
!     <association name="HAVE_DIRECTED" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5298" y="2805" width="106" height="35">
          <code>HAVE_DIRECTED</code>
          <notes />
***************
*** 74,78 ****
          <associationLink linkedEntity="Director" cardinality="3" />
      </association>
!     <association name="IS_OF" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5101" y="2649" width="50" height="20">
          <code>IS_OF</code>
          <notes />
--- 66,70 ----
          <associationLink linkedEntity="Director" cardinality="3" />
      </association>
!     <association name="IS_OF" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5301" y="2703" width="50" height="35">
          <code>IS_OF</code>
          <notes />
***************
*** 80,84 ****
          <associationLink linkedEntity="Movie" cardinality="3" />
      </association>
!     <association name="RECORDED" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5204" y="2611" width="71" height="20">
          <code>RECORDED</code>
          <notes />
--- 72,76 ----
          <associationLink linkedEntity="Movie" cardinality="3" />
      </association>
!     <association name="RECORDED" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5204" y="2611" width="71" height="35">
          <code>RECORDED</code>
          <notes />
***************
*** 86,90 ****
          <associationLink linkedEntity="Tape" cardinality="1" />
      </association>
!     <association name="PLAY_IN" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5621" y="2722" width="64" height="20">
          <code>PLAY_IN</code>
          <notes />
--- 78,82 ----
          <associationLink linkedEntity="Tape" cardinality="1" />
      </association>
!     <association name="PLAY_IN" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5621" y="2722" width="64" height="35">
          <code>PLAY_IN</code>
          <notes />
***************
*** 92,96 ****
          <associationLink linkedEntity="Actor" cardinality="3" />
      </association>
!     <association name="RENT" javaName="" idMethod="null" skipSql="false" abstract="false" baseClass="" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5472" y="2573" width="43" height="20">
          <code>RENT</code>
          <notes />
--- 84,88 ----
          <associationLink linkedEntity="Actor" cardinality="3" />
      </association>
!     <association name="RENT" javaName="" idMethod="null" skipSql="false" abstract="false" basePeer="org.apache.torque.util.BasePeer" alias="" javaNamingMethod="null" heavyIndexing="false" description="" x="5370" y="2542" width="43" height="35">
          <code>RENT</code>
          <notes />