Author: arminw
Date: Sun Jan 27 18:20:03 2008
New Revision: 615712
URL: http://svn.apache.org/viewvc?rev=615712&view=rev
Log:
comment out the OTM stuff and fix resultant issues
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-data-new.xml
db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-data-new.xml
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-data-new.xml?rev=615712&r1=615711&r2=615712&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-data-new.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-data-new.xml Sun Jan 27
18:20:03 2008
@@ -127,16 +127,16 @@
<OrderPosition id="2" order_id="1" article_id="100"/>
<OrderPosition id="3" order_id="1" article_id="200"/>
- <Person-1 id="1" firstname="tom" lastname="tom"/>
- <Person-1 id="2" firstname="bob" lastname="bob"/>
- <Person-1 id="3" firstname="albert" lastname="albert"/>
- <Person-1 id="4" firstname="bertrand" lastname="bertrand"/>
- <Person-1 id="5" firstname="cindy" lastname="cindy"/>
- <Person-1 id="6" firstname="dorothy" lastname="dorothy"/>
- <Person-1 id="7" firstname="eugen" lastname="eugen"/>
- <Person-1 id="8" firstname="frido" lastname="frido"/>
- <Person-1 id="9" firstname="guido" lastname="guido"/>
- <Person-1 id="10" firstname="hank%" lastname="hank"/>
+ <Person id="1" firstname="tom" lastname="tom"/>
+ <Person id="2" firstname="bob" lastname="bob"/>
+ <Person id="3" firstname="albert" lastname="albert"/>
+ <Person id="4" firstname="bertrand" lastname="bertrand"/>
+ <Person id="5" firstname="cindy" lastname="cindy"/>
+ <Person id="6" firstname="dorothy" lastname="dorothy"/>
+ <Person id="7" firstname="eugen" lastname="eugen"/>
+ <Person id="8" firstname="frido" lastname="frido"/>
+ <Person id="9" firstname="guido" lastname="guido"/>
+ <Person id="10" firstname="hank%" lastname="hank"/>
<Project id="1" title="OJB" description="OJB" />
<Project id="2" title="SODA" description="SODA" />
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml
URL:
http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml?rev=615712&r1=615711&r2=615712&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/schema/ojbtest-schema.xml Sun Jan 27
18:20:03 2008
@@ -1654,82 +1654,82 @@
<!-- Classes for OTM dependent objects test -->
<!-- ************************************************* -->
- <table name="OTM_ADDRESS"
- javaName="OtmAddress">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="COUNTRY" type="VARCHAR" size="60"
- javaName="country"/>
- <column name="CITY" type="VARCHAR" size="60"
- javaName="city"/>
- <column name="STREET" type="VARCHAR" size="60"
- javaName="street"/>
- </table>
-
- <table name="OTM_PERSON"
- javaName="OtmPerson">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="FIRSTNAME" type="VARCHAR" size="60"
- javaName="firstname"/>
- <column name="LASTNAME" type="VARCHAR" size="60"
- javaName="lastname"/>
- <column name="MAIN_ADDRESS_ID" type="INTEGER" required="false"
- javaName="mainAddressId"/>
- <foreign-key foreignTable="OTM_ADDRESS">
- <reference local="MAIN_ADDRESS_ID" foreign="ID"/>
- </foreign-key>
- </table>
-
- <table name="OTM_ADDRESS_DESC"
- javaName="OtmAddressDesc">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="DESCRIPTION" type="VARCHAR" size="60"
- javaName="desc"/>
- <column name="PERSON_ID" type="INTEGER" required="true"
- javaName="personId" />
- <column name="ADDRESS_ID" type="INTEGER" required="true"
- javaName="addressId"/>
- <foreign-key foreignTable="OTM_ADDRESS">
- <reference local="ADDRESS_ID" foreign="ID"/>
- </foreign-key>
- <foreign-key foreignTable="OTM_PERSON">
- <reference local="PERSON_ID" foreign="ID"/>
- </foreign-key>
- </table>
-
- <table name="OTM_PERSON2"
- javaName="OtmPerson2">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="NAME" type="VARCHAR" size="60"
- javaName="name"/>
- </table>
-
- <table name="OTM_PERSON3"
- javaName="OtmPerson2">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="NAME" type="VARCHAR" size="60"
- javaName="name"/>
- </table>
-
- <table name="OTM_ADDRESS2"
- javaName="OtmAddress2">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="PERSON_ID" type="INTEGER" required="true"
- javaName="personId" />
- </table>
-
- <table name="OTM_DEBITOR"
- javaName="OtmDebitor">
- <column name="ID" required="true" primaryKey="true" type="INTEGER"
- javaName="id"/>
- <column name="PERSON_ID" type="INTEGER" required="true"
- javaName="personId" />
- </table>
+ <!--<table name="OTM_ADDRESS"-->
+ <!--javaName="OtmAddress">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="COUNTRY" type="VARCHAR" size="60"-->
+ <!--javaName="country"/>-->
+ <!--<column name="CITY" type="VARCHAR" size="60"-->
+ <!--javaName="city"/>-->
+ <!--<column name="STREET" type="VARCHAR" size="60"-->
+ <!--javaName="street"/>-->
+ <!--</table>-->
+
+ <!--<table name="OTM_PERSON"-->
+ <!--javaName="OtmPerson">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="FIRSTNAME" type="VARCHAR" size="60"-->
+ <!--javaName="firstname"/>-->
+ <!--<column name="LASTNAME" type="VARCHAR" size="60"-->
+ <!--javaName="lastname"/>-->
+ <!--<column name="MAIN_ADDRESS_ID" type="INTEGER" required="false"-->
+ <!--javaName="mainAddressId"/>-->
+ <!--<foreign-key foreignTable="OTM_ADDRESS">-->
+ <!--<reference local="MAIN_ADDRESS_ID" foreign="ID"/>-->
+ <!--</foreign-key>-->
+ <!--</table>-->
+
+ <!--<table name="OTM_ADDRESS_DESC"-->
+ <!--javaName="OtmAddressDesc">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="DESCRIPTION" type="VARCHAR" size="60"-->
+ <!--javaName="desc"/>-->
+ <!--<column name="PERSON_ID" type="INTEGER" required="true"-->
+ <!--javaName="personId" />-->
+ <!--<column name="ADDRESS_ID" type="INTEGER" required="true"-->
+ <!--javaName="addressId"/>-->
+ <!--<foreign-key foreignTable="OTM_ADDRESS">-->
+ <!--<reference local="ADDRESS_ID" foreign="ID"/>-->
+ <!--</foreign-key>-->
+ <!--<foreign-key foreignTable="OTM_PERSON">-->
+ <!--<reference local="PERSON_ID" foreign="ID"/>-->
+ <!--</foreign-key>-->
+ <!--</table>-->
+
+ <!--<table name="OTM_PERSON2"-->
+ <!--javaName="OtmPerson2">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="NAME" type="VARCHAR" size="60"-->
+ <!--javaName="name"/>-->
+ <!--</table>-->
+
+ <!--<table name="OTM_PERSON3"-->
+ <!--javaName="OtmPerson2">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="NAME" type="VARCHAR" size="60"-->
+ <!--javaName="name"/>-->
+ <!--</table>-->
+
+ <!--<table name="OTM_ADDRESS2"-->
+ <!--javaName="OtmAddress2">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="PERSON_ID" type="INTEGER" required="true"-->
+ <!--javaName="personId" />-->
+ <!--</table>-->
+
+ <!--<table name="OTM_DEBITOR"-->
+ <!--javaName="OtmDebitor">-->
+ <!--<column name="ID" required="true" primaryKey="true" type="INTEGER"-->
+ <!--javaName="id"/>-->
+ <!--<column name="PERSON_ID" type="INTEGER" required="true"-->
+ <!--javaName="personId" />-->
+ <!--</table>-->
<!-- ************************************************* -->
<!-- Classes for path tests -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
