cayenne-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrus Adamchik <and...@objectstyle.org>
Subject Re: svn commit: r918641 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/
Date Wed, 03 Mar 2010 19:59:09 GMT
Yeah, I guess the stupid Spring-based loader of the test projects does  
its job here isolating tests from Cayenne configuration changes. (It  
was/is on my list to get rid of the Spring loader :-))

Andrus

On Mar 3, 2010, at 2:31 PM, Andrey Razumovsky wrote:

> Hi Andrus,
>
> I wanted to make some changes to test project for another JIRA. How  
> else
> could I do that if new modeler cannot open old-styled project without
> upgrading. Yeah, tests seem to work (Hudson correct me if I'm  
> wrong :-) )
>
> 2010/3/3 Andrus Adamchik <andrus@objectstyle.org>
>
>> Andrey,
>>
>> Not sure if that's a bit premature, as we are not quite there yet  
>> with the
>> new stack... but as long as the unit tests keep working, I guess  
>> that's ok.
>>
>> Andrus
>>
>>
>> On Mar 3, 2010, at 2:19 PM, andrey@apache.org wrote:
>>
>> Author: andrey
>>> Date: Wed Mar  3 19:19:24 2010
>>> New Revision: 918641
>>>
>>> URL: http://svn.apache.org/viewvc?rev=918641&view=rev
>>> Log:
>>> auto-migrating test project to newer version
>>>
>>> Added:
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/cayenne-default.xml
>>> Removed:
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/cayenne.xml
>>> Modified:
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/embeddable.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/generic.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance-flat.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/locking.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db1.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db2.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/multi-tier.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/people.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/qualified.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/quotemap.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/relationships.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/sus-map.map.xml
>>>
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/testmap.map.xml
>>>
>>> Added:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/cayenne-default.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/cayenne-default.xml?rev=918641&view=auto
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/cayenne-default.xml
>>> (added)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/cayenne-default.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -0,0 +1,17 @@
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<domain project-version="6">
>>> +       <map name="embeddable"/>
>>> +       <map name="generic"/>
>>> +       <map name="inheritance"/>
>>> +       <map name="inheritance-flat"/>
>>> +       <map name="locking"/>
>>> +       <map name="map-db1"/>
>>> +       <map name="map-db2"/>
>>> +       <map name="multi-tier"/>
>>> +       <map name="people"/>
>>> +       <map name="qualified"/>
>>> +       <map name="quotemap"/>
>>> +       <map name="relationships"/>
>>> +       <map name="sus-map"/>
>>> +       <map name="testmap"/>
>>> +</domain>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/embeddable.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/embeddable.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/embeddable.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/embeddable.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,27 +1,27 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> -       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.embeddable"/>
>>> -       <embeddable
>>> className="org.apache.cayenne.testdo.embeddable.Embeddable1">
>>> -               <embeddable-attribute name="embedded10"
>>> type="java.lang.String" db-attribute-name="EMBEDDED10"/>
>>> -               <embeddable-attribute name="embedded20"
>>> type="java.lang.String" db-attribute-name="EMBEDDED20"/>
>>> -       </embeddable>
>>> -       <db-entity name="EMBED_ENTITY1">
>>> -               <db-attribute name="EMBEDDED10" type="VARCHAR"
>>> length="100"/>
>>> -               <db-attribute name="EMBEDDED20" type="VARCHAR"
>>> length="100"/>
>>> -               <db-attribute name="EMBEDDED30" type="VARCHAR"
>>> length="100"/>
>>> -               <db-attribute name="EMBEDDED40" type="VARCHAR"
>>> length="100"/>
>>> -               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="NAME" type="VARCHAR"  
>>> length="100"/>
>>> -       </db-entity>
>>> -       <obj-entity name="EmbedEntity1"
>>> className="org.apache.cayenne.testdo.embeddable.EmbedEntity1"
>>> dbEntityName="EMBED_ENTITY1">
>>> -               <embedded-attribute name="embedded1"
>>> type="org.apache.cayenne.testdo.embeddable.Embeddable1"/>
>>> -               <embedded-attribute name="embedded2"
>>> type="org.apache.cayenne.testdo.embeddable.Embeddable1">
>>> -                       <embeddable-attribute-override  
>>> name="embedded10"
>>> db-attribute-path="EMBEDDED30"/>
>>> -                       <embeddable-attribute-override  
>>> name="embedded20"
>>> db-attribute-path="EMBEDDED40"/>
>>> -               </embedded-attribute>
>>> -               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> -       </obj-entity>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.embeddable"/>
>>> +       <embeddable
>>> className="org.apache.cayenne.testdo.embeddable.Embeddable1">
>>> +               <embeddable-attribute name="embedded10"
>>> type="java.lang.String" db-attribute-name="EMBEDDED10"/>
>>> +               <embeddable-attribute name="embedded20"
>>> type="java.lang.String" db-attribute-name="EMBEDDED20"/>
>>> +       </embeddable>
>>> +       <db-entity name="EMBED_ENTITY1">
>>> +               <db-attribute name="EMBEDDED10" type="VARCHAR"
>>> length="100"/>
>>> +               <db-attribute name="EMBEDDED20" type="VARCHAR"
>>> length="100"/>
>>> +               <db-attribute name="EMBEDDED30" type="VARCHAR"
>>> length="100"/>
>>> +               <db-attribute name="EMBEDDED40" type="VARCHAR"
>>> length="100"/>
>>> +               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="NAME" type="VARCHAR"  
>>> length="100"/>
>>> +       </db-entity>
>>> +       <obj-entity name="EmbedEntity1"
>>> className="org.apache.cayenne.testdo.embeddable.EmbedEntity1"
>>> dbEntityName="EMBED_ENTITY1">
>>> +               <embedded-attribute name="embedded1"
>>> type="org.apache.cayenne.testdo.embeddable.Embeddable1"/>
>>> +               <embedded-attribute name="embedded2"
>>> type="org.apache.cayenne.testdo.embeddable.Embeddable1">
>>> +                       <embeddable-attribute-override  
>>> name="embedded10"
>>> db-attribute-path="EMBEDDED30"/>
>>> +                       <embeddable-attribute-override  
>>> name="embedded20"
>>> db-attribute-path="EMBEDDED40"/>
>>> +               </embedded-attribute>
>>> +               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> +       </obj-entity>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/generic.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/generic.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/generic.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/generic.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.generic"/>
>>>       <db-entity name="GENERIC1">
>>>               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance-flat.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance-flat.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance-flat.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance-flat.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,80 +1,80 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -  xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -  project-version="3.0.0.1">
>>> -       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.inheritance_flat"/>
>>> -       <db-entity name="GroupMembers">
>>> -               <db-attribute name="group_id" type="BIGINT"
>>> isMandatory="true"/>
>>> -               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="role_id" type="BIGINT"
>>> isMandatory="true"/>
>>> -       </db-entity>
>>> -       <db-entity name="GroupProperties">
>>> -               <db-attribute name="description" type="VARCHAR"
>>> length="100"/>
>>> -               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -       </db-entity>
>>> -       <db-entity name="Roles">
>>> -               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="name" type="VARCHAR"
>>> isMandatory="true" length="32"/>
>>> -               <db-attribute name="type" type="SMALLINT"
>>> isMandatory="true"/>
>>> -       </db-entity>
>>> -       <db-entity name="UserProperties">
>>> -               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="nickname" type="VARCHAR"  
>>> length="32"/>
>>> -       </db-entity>
>>> -       <obj-entity name="Group" superEntityName="User"
>>> className="org.apache.cayenne.testdo.inheritance_flat.Group">
>>> -               <qualifier><![CDATA[type = 2]]></qualifier>
>>> -       </obj-entity>
>>> -       <obj-entity name="GroupProperties"
>>> className 
>>> ="org.apache.cayenne.testdo.inheritance_flat.GroupProperties"
>>> dbEntityName="GroupProperties">
>>> -               <obj-attribute name="description"  
>>> type="java.lang.String"
>>> db-attribute-path="description"/>
>>> -               <obj-attribute name="id" type="java.lang.Long"
>>> db-attribute-path="id"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="Role"
>>> className="org.apache.cayenne.testdo.inheritance_flat.Role"
>>> dbEntityName="Roles">
>>> -               <qualifier><![CDATA[type = 0]]></qualifier>
>>> -               <obj-attribute name="id" type="long"
>>> db-attribute-path="id"/>
>>> -               <obj-attribute name="name" type="java.lang.String"
>>> lock="true" db-attribute-path="name"/>
>>> -               <obj-attribute name="type" type="int"
>>> db-attribute-path="type"/>
>>> -               <post-persist method-name="onPostPersist"/>
>>> -               <post-update method-name="onPostUpdate"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="User" superEntityName="Role"
>>> className="org.apache.cayenne.testdo.inheritance_flat.User">
>>> -               <qualifier><![CDATA[type = 1]]></qualifier>
>>> -               <attribute-override name="id" db-attribute- 
>>> path="id"/>
>>> -               <attribute-override name="name" db-attribute- 
>>> path="name"/>
>>> -               <attribute-override name="type" db-attribute- 
>>> path="type"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="UserProperties"
>>> className 
>>> ="org.apache.cayenne.testdo.inheritance_flat.UserProperties"
>>> dbEntityName="UserProperties">
>>> -               <obj-attribute name="id" type="java.lang.Long"
>>> db-attribute-path="id"/>
>>> -               <obj-attribute name="nickname"  
>>> type="java.lang.String"
>>> db-attribute-path="nickname"/>
>>> -       </obj-entity>
>>> -       <db-relationship name="group" source="GroupMembers"  
>>> target="Roles"
>>> toMany="false">
>>> -               <db-attribute-pair source="group_id" target="id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="role" source="GroupMembers"  
>>> target="Roles"
>>> toMany="false">
>>> -               <db-attribute-pair source="role_id" target="id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="group" source="GroupProperties"
>>> target="Roles" toMany="false">
>>> -               <db-attribute-pair source="id" target="id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="group_members" source="Roles"
>>> target="GroupMembers" toMany="true">
>>> -               <db-attribute-pair source="id" target="group_id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="group_properties" source="Roles"
>>> target="GroupProperties" toDependentPK="true" toMany="false">
>>> -               <db-attribute-pair source="id" target="id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="role_groups" source="Roles"
>>> target="GroupMembers" toMany="true">
>>> -               <db-attribute-pair source="id" target="role_id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="user_properties" source="Roles"
>>> target="UserProperties" toDependentPK="true" toMany="false">
>>> -               <db-attribute-pair source="id" target="id"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="user" source="UserProperties"
>>> target="Roles" toMany="false">
>>> -               <db-attribute-pair source="id" target="id"/>
>>> -       </db-relationship>
>>> -       <obj-relationship name="groupMembers" source="Group"  
>>> target="Role"
>>> deleteRule="Nullify" db-relationship-path="group_members.role"/>
>>> -       <obj-relationship name="groupProperties" source="Group"
>>> target="GroupProperties" deleteRule="Cascade"
>>> db-relationship-path="group_properties"/>
>>> -       <obj-relationship name="group" source="GroupProperties"
>>> target="Group" deleteRule="Nullify" db-relationship-path="group"/>
>>> -       <obj-relationship name="roleGroups" source="Role"  
>>> target="Group"
>>> deleteRule="Nullify" db-relationship-path="role_groups.group"/>
>>> -       <obj-relationship name="userProperties" source="User"
>>> target="UserProperties" deleteRule="Cascade"
>>> db-relationship-path="user_properties"/>
>>> -       <obj-relationship name="user" source="UserProperties"
>>> target="User" deleteRule="Nullify" db-relationship-path="user"/>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.inheritance_flat"/>
>>> +       <db-entity name="GroupMembers">
>>> +               <db-attribute name="group_id" type="BIGINT"
>>> isMandatory="true"/>
>>> +               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="role_id" type="BIGINT"
>>> isMandatory="true"/>
>>> +       </db-entity>
>>> +       <db-entity name="GroupProperties">
>>> +               <db-attribute name="description" type="VARCHAR"
>>> length="100"/>
>>> +               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +       </db-entity>
>>> +       <db-entity name="Roles">
>>> +               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="name" type="VARCHAR"
>>> isMandatory="true" length="32"/>
>>> +               <db-attribute name="type" type="SMALLINT"
>>> isMandatory="true"/>
>>> +       </db-entity>
>>> +       <db-entity name="UserProperties">
>>> +               <db-attribute name="id" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="nickname" type="VARCHAR"  
>>> length="32"/>
>>> +       </db-entity>
>>> +       <obj-entity name="Group" superEntityName="User"
>>> className="org.apache.cayenne.testdo.inheritance_flat.Group">
>>> +               <qualifier><![CDATA[type = 2]]></qualifier>
>>> +       </obj-entity>
>>> +       <obj-entity name="GroupProperties"
>>> className 
>>> ="org.apache.cayenne.testdo.inheritance_flat.GroupProperties"
>>> dbEntityName="GroupProperties">
>>> +               <obj-attribute name="description"  
>>> type="java.lang.String"
>>> db-attribute-path="description"/>
>>> +               <obj-attribute name="id" type="java.lang.Long"
>>> db-attribute-path="id"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="Role"
>>> className="org.apache.cayenne.testdo.inheritance_flat.Role"
>>> dbEntityName="Roles">
>>> +               <qualifier><![CDATA[type = 0]]></qualifier>
>>> +               <obj-attribute name="id" type="long"
>>> db-attribute-path="id"/>
>>> +               <obj-attribute name="name" type="java.lang.String"
>>> lock="true" db-attribute-path="name"/>
>>> +               <obj-attribute name="type" type="int"
>>> db-attribute-path="type"/>
>>> +               <post-persist method-name="onPostPersist"/>
>>> +               <post-update method-name="onPostUpdate"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="User" superEntityName="Role"
>>> className="org.apache.cayenne.testdo.inheritance_flat.User">
>>> +               <qualifier><![CDATA[type = 1]]></qualifier>
>>> +               <attribute-override name="id" db-attribute- 
>>> path="id"/>
>>> +               <attribute-override name="name" db-attribute- 
>>> path="name"/>
>>> +               <attribute-override name="type" db-attribute- 
>>> path="type"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="UserProperties"
>>> className 
>>> ="org.apache.cayenne.testdo.inheritance_flat.UserProperties"
>>> dbEntityName="UserProperties">
>>> +               <obj-attribute name="id" type="java.lang.Long"
>>> db-attribute-path="id"/>
>>> +               <obj-attribute name="nickname"  
>>> type="java.lang.String"
>>> db-attribute-path="nickname"/>
>>> +       </obj-entity>
>>> +       <db-relationship name="group" source="GroupMembers"  
>>> target="Roles"
>>> toMany="false">
>>> +               <db-attribute-pair source="group_id" target="id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="role" source="GroupMembers"  
>>> target="Roles"
>>> toMany="false">
>>> +               <db-attribute-pair source="role_id" target="id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="group" source="GroupProperties"
>>> target="Roles" toMany="false">
>>> +               <db-attribute-pair source="id" target="id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="group_members" source="Roles"
>>> target="GroupMembers" toMany="true">
>>> +               <db-attribute-pair source="id" target="group_id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="group_properties" source="Roles"
>>> target="GroupProperties" toDependentPK="true" toMany="false">
>>> +               <db-attribute-pair source="id" target="id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="role_groups" source="Roles"
>>> target="GroupMembers" toMany="true">
>>> +               <db-attribute-pair source="id" target="role_id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="user_properties" source="Roles"
>>> target="UserProperties" toDependentPK="true" toMany="false">
>>> +               <db-attribute-pair source="id" target="id"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="user" source="UserProperties"
>>> target="Roles" toMany="false">
>>> +               <db-attribute-pair source="id" target="id"/>
>>> +       </db-relationship>
>>> +       <obj-relationship name="groupMembers" source="Group"  
>>> target="Role"
>>> deleteRule="Nullify" db-relationship-path="group_members.role"/>
>>> +       <obj-relationship name="groupProperties" source="Group"
>>> target="GroupProperties" deleteRule="Cascade"
>>> db-relationship-path="group_properties"/>
>>> +       <obj-relationship name="group" source="GroupProperties"
>>> target="Group" deleteRule="Nullify" db-relationship-path="group"/>
>>> +       <obj-relationship name="roleGroups" source="Role"  
>>> target="Group"
>>> deleteRule="Nullify" db-relationship-path="role_groups.group"/>
>>> +       <obj-relationship name="userProperties" source="User"
>>> target="UserProperties" deleteRule="Cascade"
>>> db-relationship-path="user_properties"/>
>>> +       <obj-relationship name="user" source="UserProperties"
>>> target="User" deleteRule="Nullify" db-relationship-path="user"/>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/inheritance.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/inheritance.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,41 +1,41 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> -       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.horizontalinherit"/>
>>> -       <db-entity name="INHERITANCE_SUB_ENTITY1">
>>> -               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="SUBENTITY_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> -               <db-attribute name="SUPER_INT_DB_ATTR"  
>>> type="INTEGER"/>
>>> -               <db-attribute name="SUPER_STRING_DB_ATTR"  
>>> type="VARCHAR"
>>> length="255"/>
>>> -       </db-entity>
>>> -       <db-entity name="INHERITANCE_SUB_ENTITY2">
>>> -               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="OVERRIDDEN_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> -               <db-attribute name="SUBENTITY_INT_DB_ATTR"
>>> type="INTEGER"/>
>>> -               <db-attribute name="SUPER_INT_DB_ATTR"  
>>> type="INTEGER"/>
>>> -       </db-entity>
>>> -       <db-entity name="INHERITANCE_SUB_ENTITY3">
>>> -               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="OVERRIDDEN_INT_DB_ATTR"
>>> type="INTEGER"/>
>>> -               <db-attribute name="OVERRIDDEN_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> -               <db-attribute name="SUBENTITY_BOOL_ATTR"  
>>> type="BIT"/>
>>> -       </db-entity>
>>> -       <obj-entity name="AbstractSuperEntity" abstract="true"
>>> className 
>>> ="org.apache.cayenne.testdo.horizontalinherit.AbstractSuperEntity">
>>> -               <obj-attribute name="superIntAttr" type="int"
>>> db-attribute-path="SUPER_INT_DB_ATTR"/>
>>> -               <obj-attribute name="superStringAttr"
>>> type="java.lang.String" db-attribute-path="SUPER_STRING_DB_ATTR"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="SubEntity1"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity1"
>>> dbEntityName="INHERITANCE_SUB_ENTITY1">
>>> -               <obj-attribute name="subEntityStringAttr"
>>> type="java.lang.String" db-attribute- 
>>> path="SUBENTITY_STRING_DB_ATTR"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="SubEntity2"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity2"
>>> dbEntityName="INHERITANCE_SUB_ENTITY2">
>>> -               <obj-attribute name="subEntityIntAttr" type="int"
>>> db-attribute-path="SUBENTITY_INT_DB_ATTR"/>
>>> -               <attribute-override name="superStringAttr"
>>> db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="SubEntity3"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity3"
>>> dbEntityName="INHERITANCE_SUB_ENTITY3">
>>> -               <obj-attribute name="subBooleanAttr" type="boolean"
>>> db-attribute-path="SUBENTITY_BOOL_ATTR"/>
>>> -               <attribute-override name="superIntAttr"
>>> db-attribute-path="OVERRIDDEN_INT_DB_ATTR"/>
>>> -               <attribute-override name="superStringAttr"
>>> db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
>>> -       </obj-entity>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.horizontalinherit"/>
>>> +       <db-entity name="INHERITANCE_SUB_ENTITY1">
>>> +               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="SUBENTITY_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> +               <db-attribute name="SUPER_INT_DB_ATTR"  
>>> type="INTEGER"/>
>>> +               <db-attribute name="SUPER_STRING_DB_ATTR"  
>>> type="VARCHAR"
>>> length="255"/>
>>> +       </db-entity>
>>> +       <db-entity name="INHERITANCE_SUB_ENTITY2">
>>> +               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="OVERRIDDEN_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> +               <db-attribute name="SUBENTITY_INT_DB_ATTR"
>>> type="INTEGER"/>
>>> +               <db-attribute name="SUPER_INT_DB_ATTR"  
>>> type="INTEGER"/>
>>> +       </db-entity>
>>> +       <db-entity name="INHERITANCE_SUB_ENTITY3">
>>> +               <db-attribute name="ID" type="BIGINT"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="OVERRIDDEN_INT_DB_ATTR"
>>> type="INTEGER"/>
>>> +               <db-attribute name="OVERRIDDEN_STRING_DB_ATTR"
>>> type="VARCHAR" length="255"/>
>>> +               <db-attribute name="SUBENTITY_BOOL_ATTR"  
>>> type="BIT"/>
>>> +       </db-entity>
>>> +       <obj-entity name="AbstractSuperEntity" abstract="true"
>>> className 
>>> ="org.apache.cayenne.testdo.horizontalinherit.AbstractSuperEntity">
>>> +               <obj-attribute name="superIntAttr" type="int"
>>> db-attribute-path="SUPER_INT_DB_ATTR"/>
>>> +               <obj-attribute name="superStringAttr"
>>> type="java.lang.String" db-attribute-path="SUPER_STRING_DB_ATTR"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="SubEntity1"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity1"
>>> dbEntityName="INHERITANCE_SUB_ENTITY1">
>>> +               <obj-attribute name="subEntityStringAttr"
>>> type="java.lang.String" db-attribute- 
>>> path="SUBENTITY_STRING_DB_ATTR"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="SubEntity2"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity2"
>>> dbEntityName="INHERITANCE_SUB_ENTITY2">
>>> +               <obj-attribute name="subEntityIntAttr" type="int"
>>> db-attribute-path="SUBENTITY_INT_DB_ATTR"/>
>>> +               <attribute-override name="superStringAttr"
>>> db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="SubEntity3"
>>> superEntityName="AbstractSuperEntity"
>>> className="org.apache.cayenne.testdo.horizontalinherit.SubEntity3"
>>> dbEntityName="INHERITANCE_SUB_ENTITY3">
>>> +               <obj-attribute name="subBooleanAttr" type="boolean"
>>> db-attribute-path="SUBENTITY_BOOL_ATTR"/>
>>> +               <attribute-override name="superIntAttr"
>>> db-attribute-path="OVERRIDDEN_INT_DB_ATTR"/>
>>> +               <attribute-override name="superStringAttr"
>>> db-attribute-path="OVERRIDDEN_STRING_DB_ATTR"/>
>>> +       </obj-entity>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/locking.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/locking.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/locking.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/locking.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.locking"/>
>>>       <db-entity name="DATE_LOCKING_TEST">
>>>               <db-attribute name="DATE_LOCK" type="DATE"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db1.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/map-db1.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db1.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db1.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.db1"/>
>>>       <db-entity name="CROSSDB_M1E1">
>>>               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db2.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/map-db2.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db2.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/map-db2.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.db2"/>
>>>       <db-entity name="CROSSDB_M2E1">
>>>               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/multi-tier.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/multi-tier.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/multi-tier.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/multi-tier.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage" value="
>>> org.apache.cayenne.testdo.mt"/>
>>>       <property name="clientSupported" value="true"/>
>>>       <property name="defaultClientPackage" value="
>>> org.apache.cayenne.testdo.mt"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/people.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/people.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/people.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/people.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.inherit"/>
>>>       <db-entity name="ADDRESS">
>>>               <db-attribute name="ADDRESS_ID" type="INTEGER"
>>> isPrimaryKey="true" isMandatory="true"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/qualified.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/qualified.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/qualified.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/qualified.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,36 +1,36 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> -       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.qualified"/>
>>> -       <db-entity name="QUALIFIED1">
>>> -               <db-attribute name="DELETED" type="BOOLEAN"/>
>>> -               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="NAME" type="VARCHAR"  
>>> length="200"/>
>>> -       </db-entity>
>>> -       <db-entity name="QUALIFIED2">
>>> -               <db-attribute name="DELETED" type="BOOLEAN"/>
>>> -               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="NAME" type="VARCHAR"  
>>> length="200"/>
>>> -               <db-attribute name="QUALIFIED1_ID" type="INTEGER"/>
>>> -       </db-entity>
>>> -       <obj-entity name="Qualified1"
>>> className="org.apache.cayenne.testdo.qualified.Qualified1"
>>> dbEntityName="QUALIFIED1">
>>> -               <qualifier><![CDATA[deleted = null]]></qualifier>
>>> -               <obj-attribute name="deleted"  
>>> type="java.lang.Boolean"
>>> db-attribute-path="DELETED"/>
>>> -               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="Qualified2"
>>> className="org.apache.cayenne.testdo.qualified.Qualified2"
>>> dbEntityName="QUALIFIED2">
>>> -               <qualifier><![CDATA[deleted = null]]></qualifier>
>>> -               <obj-attribute name="deleted"  
>>> type="java.lang.Boolean"
>>> db-attribute-path="DELETED"/>
>>> -               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> -       </obj-entity>
>>> -       <db-relationship name="qualified2s" source="QUALIFIED1"
>>> target="QUALIFIED2" toMany="true">
>>> -               <db-attribute-pair source="ID"  
>>> target="QUALIFIED1_ID"/>
>>> -       </db-relationship>
>>> -       <db-relationship name="qualified1" source="QUALIFIED2"
>>> target="QUALIFIED1" toMany="false">
>>> -               <db-attribute-pair source="QUALIFIED1_ID"  
>>> target="ID"/>
>>> -       </db-relationship>
>>> -       <obj-relationship name="qualified2s" source="Qualified1"
>>> target="Qualified2" db-relationship-path="qualified2s"/>
>>> -       <obj-relationship name="qualified1" source="Qualified2"
>>> target="Qualified1" db-relationship-path="qualified1"/>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.qualified"/>
>>> +       <db-entity name="QUALIFIED1">
>>> +               <db-attribute name="DELETED" type="BOOLEAN"/>
>>> +               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="NAME" type="VARCHAR"  
>>> length="200"/>
>>> +       </db-entity>
>>> +       <db-entity name="QUALIFIED2">
>>> +               <db-attribute name="DELETED" type="BOOLEAN"/>
>>> +               <db-attribute name="ID" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="NAME" type="VARCHAR"  
>>> length="200"/>
>>> +               <db-attribute name="QUALIFIED1_ID" type="INTEGER"/>
>>> +       </db-entity>
>>> +       <obj-entity name="Qualified1"
>>> className="org.apache.cayenne.testdo.qualified.Qualified1"
>>> dbEntityName="QUALIFIED1">
>>> +               <qualifier><![CDATA[deleted = null]]></qualifier>
>>> +               <obj-attribute name="deleted"  
>>> type="java.lang.Boolean"
>>> db-attribute-path="DELETED"/>
>>> +               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="Qualified2"
>>> className="org.apache.cayenne.testdo.qualified.Qualified2"
>>> dbEntityName="QUALIFIED2">
>>> +               <qualifier><![CDATA[deleted = null]]></qualifier>
>>> +               <obj-attribute name="deleted"  
>>> type="java.lang.Boolean"
>>> db-attribute-path="DELETED"/>
>>> +               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> +       </obj-entity>
>>> +       <db-relationship name="qualified2s" source="QUALIFIED1"
>>> target="QUALIFIED2" toMany="true">
>>> +               <db-attribute-pair source="ID"  
>>> target="QUALIFIED1_ID"/>
>>> +       </db-relationship>
>>> +       <db-relationship name="qualified1" source="QUALIFIED2"
>>> target="QUALIFIED1" toMany="false">
>>> +               <db-attribute-pair source="QUALIFIED1_ID"  
>>> target="ID"/>
>>> +       </db-relationship>
>>> +       <obj-relationship name="qualified2s" source="Qualified1"
>>> target="Qualified2" db-relationship-path="qualified2s"/>
>>> +       <obj-relationship name="qualified1" source="Qualified2"
>>> target="Qualified1" db-relationship-path="qualified1"/>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/quotemap.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/quotemap.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/quotemap.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/quotemap.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,28 +1,28 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> -       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.quotemap"/>
>>> -       <property name="quoteSqlIdentifiers" value="true"/>
>>> -       <db-entity name="QUOTE_ADRESS">
>>> -               <db-attribute name="ADRES ID" type="INTEGER"
>>> isPrimaryKey="true" isMandatory="true"/>
>>> -               <db-attribute name="City" type="VARCHAR"  
>>> length="200"/>
>>> -       </db-entity>
>>> -       <db-entity name="quote Person">
>>> -               <db-attribute name="DAte" type="DATE"/>
>>> -               <db-attribute name="FULL name" type="VARCHAR"
>>> length="300"/>
>>> -               <db-attribute name="NAME" type="VARCHAR"  
>>> length="100"/>
>>> -               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="salary" type="INTEGER"/>
>>> -       </db-entity>
>>> -       <obj-entity name="QuoteAdress"
>>> className="org.apache.cayenne.testdo.quotemap.QuoteAdress"
>>> dbEntityName="QUOTE_ADRESS">
>>> -               <obj-attribute name="city" type="java.lang.String"
>>> db-attribute-path="City"/>
>>> -       </obj-entity>
>>> -       <obj-entity name="Quote_Person"
>>> className="org.apache.cayenne.testdo.quotemap.Quote_Person"
>>> dbEntityName="quote Person">
>>> -               <obj-attribute name="dAte" type="java.util.Date"
>>> db-attribute-path="DAte"/>
>>> -               <obj-attribute name="fULL_name"  
>>> type="java.lang.String"
>>> db-attribute-path="FULL name"/>
>>> -               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> -               <obj-attribute name="salary"  
>>> type="java.lang.Integer"
>>> db-attribute-path="salary"/>
>>> -       </obj-entity>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.quotemap"/>
>>> +       <property name="quoteSqlIdentifiers" value="true"/>
>>> +       <db-entity name="QUOTE_ADRESS">
>>> +               <db-attribute name="ADRES ID" type="INTEGER"
>>> isPrimaryKey="true" isMandatory="true"/>
>>> +               <db-attribute name="City" type="VARCHAR"  
>>> length="200"/>
>>> +       </db-entity>
>>> +       <db-entity name="quote Person">
>>> +               <db-attribute name="DAte" type="DATE"/>
>>> +               <db-attribute name="FULL name" type="VARCHAR"
>>> length="300"/>
>>> +               <db-attribute name="NAME" type="VARCHAR"  
>>> length="100"/>
>>> +               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="salary" type="INTEGER"/>
>>> +       </db-entity>
>>> +       <obj-entity name="QuoteAdress"
>>> className="org.apache.cayenne.testdo.quotemap.QuoteAdress"
>>> dbEntityName="QUOTE_ADRESS">
>>> +               <obj-attribute name="city" type="java.lang.String"
>>> db-attribute-path="City"/>
>>> +       </obj-entity>
>>> +       <obj-entity name="Quote_Person"
>>> className="org.apache.cayenne.testdo.quotemap.Quote_Person"
>>> dbEntityName="quote Person">
>>> +               <obj-attribute name="dAte" type="java.util.Date"
>>> db-attribute-path="DAte"/>
>>> +               <obj-attribute name="fULL_name"  
>>> type="java.lang.String"
>>> db-attribute-path="FULL name"/>
>>> +               <obj-attribute name="name" type="java.lang.String"
>>> db-attribute-path="NAME"/>
>>> +               <obj-attribute name="salary"  
>>> type="java.lang.Integer"
>>> db-attribute-path="salary"/>
>>> +       </obj-entity>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/relationships.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/relationships.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/relationships.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/relationships.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage"
>>> value="org.apache.cayenne.testdo.relationship"/>
>>>       <db-entity name="CLOB_DETAIL">
>>>               <db-attribute name="CLOB_DETAIL_ID" type="INTEGER"
>>> isPrimaryKey="true" isMandatory="true"/>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/sus-map.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/sus-map.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/sus-map.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/sus-map.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -1,16 +1,16 @@
>>> -<?xml version="1.0" encoding="utf-8"?>
>>> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> -        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> -        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> -       <db-entity name="SUS1">
>>> -               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -               <db-attribute name="strNoMandatory" type="VARCHAR"
>>> length="200"/>
>>> -               <db-attribute name="testBoolean" type="BOOLEAN"
>>> isMandatory="true"/>
>>> -               <db-attribute name="testChar" type="CHAR"
>>> isMandatory="true" length="200"/>
>>> -               <db-attribute name="testString" type="VARCHAR"
>>> isMandatory="true" length="200"/>
>>> -       </db-entity>
>>> -       <db-entity name="SUS2">
>>> -               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> -       </db-entity>
>>> -</data-map>
>>> +<?xml version="1.0" encoding="utf-8"?>
>>> +<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>> +        xsi:schemaLocation="
>>> http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> +        project-version="6">
>>> +       <db-entity name="SUS1">
>>> +               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +               <db-attribute name="strNoMandatory" type="VARCHAR"
>>> length="200"/>
>>> +               <db-attribute name="testBoolean" type="BOOLEAN"
>>> isMandatory="true"/>
>>> +               <db-attribute name="testChar" type="CHAR"
>>> isMandatory="true" length="200"/>
>>> +               <db-attribute name="testString" type="VARCHAR"
>>> isMandatory="true" length="200"/>
>>> +       </db-entity>
>>> +       <db-entity name="SUS2">
>>> +               <db-attribute name="id" type="INTEGER"  
>>> isPrimaryKey="true"
>>> isMandatory="true"/>
>>> +       </db-entity>
>>> +</data-map>
>>>
>>> Modified:
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/testmap.map.xml
>>> URL:
>>> http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/testmap.map.xml?rev=918641&r1=918640&r2=918641&view=diff
>>>
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> = 
>>> ====================================================================
>>> ---
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/testmap.map.xml
>>> (original)
>>> +++
>>> cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ 
>>> resources/testmap.map.xml
>>> Wed Mar  3 19:19:24 2010
>>> @@ -2,7 +2,7 @@
>>> <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
>>>        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>>>        xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap
>>> http://cayenne.apache.org/schema/3.0/modelMap.xsd"
>>> -       >
>>> +        project-version="6">
>>>       <property name="defaultPackage" value="org.apache.art"/>
>>>       <property name="defaultSuperclass"
>>> value="org.apache.cayenne.CayenneDataObject"/>
>>>       <property name="clientSupported" value="true"/>
>>>
>>>
>>>
>>>
>>
>
>
> -- 
> Andrey


Mime
View raw message