http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/inheritance-vertical.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml index 5183951..a437439 100644 --- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml +++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_vertical"/> <db-entity name="IV1_ROOT"> <db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/> @@ -96,8 +96,7 @@ <obj-entity name="Iv2Sub1" superEntityName="Iv2Root" className="org.apache.cayenne.testdo.inheritance_vertical.Iv2Sub1"> <qualifier><![CDATA[discriminator = "Iv2Sub1"]]></qualifier> </obj-entity> - <obj-entity name="Iv2X" className="org.apache.cayenne.testdo.inheritance_vertical.Iv2X" dbEntityName="IV2_X"> - </obj-entity> + <obj-entity name="Iv2X" className="org.apache.cayenne.testdo.inheritance_vertical.Iv2X" dbEntityName="IV2_X"/> <obj-entity name="IvAbstract" abstract="true" className="org.apache.cayenne.testdo.inheritance_vertical.IvAbstract" dbEntityName="IV_ABSTRACT"> <obj-attribute name="type" type="java.lang.String" db-attribute-path="TYPE"/> </obj-entity> @@ -150,19 +149,19 @@ <qualifier><![CDATA[discriminator = "IvSub3"]]></qualifier> <pre-persist method-name="onPrePersist"/> </obj-entity> - <db-relationship name="sub1" source="IV1_ROOT" target="IV1_SUB1" toDependentPK="true" toMany="false"> + <db-relationship name="sub1" source="IV1_ROOT" target="IV1_SUB1" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="root" source="IV1_SUB1" target="IV1_ROOT" toMany="false"> + <db-relationship name="root" source="IV1_SUB1" target="IV1_ROOT"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="sub1" source="IV2_ROOT" target="IV2_SUB1" toDependentPK="true" toMany="false"> + <db-relationship name="sub1" source="IV2_ROOT" target="IV2_SUB1" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="root" source="IV2_SUB1" target="IV2_ROOT" toMany="false"> + <db-relationship name="root" source="IV2_SUB1" target="IV2_ROOT"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="x" source="IV2_SUB1" target="IV2_X" toMany="false"> + <db-relationship name="x" source="IV2_SUB1" target="IV2_X"> <db-attribute-pair source="X_ID" target="ID"/> </db-relationship> <db-relationship name="sub1" source="IV2_X" target="IV2_SUB1" toMany="true"> @@ -171,34 +170,34 @@ <db-relationship name="children" source="IV_ABSTRACT" target="IV_ABSTRACT" toMany="true"> <db-attribute-pair source="ID" target="PARENT_ID"/> </db-relationship> - <db-relationship name="concrete" source="IV_ABSTRACT" target="IV_CONCRETE" toDependentPK="true" toMany="false"> + <db-relationship name="concrete" source="IV_ABSTRACT" target="IV_CONCRETE" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="parent" source="IV_ABSTRACT" target="IV_ABSTRACT" toMany="false"> + <db-relationship name="parent" source="IV_ABSTRACT" target="IV_ABSTRACT"> <db-attribute-pair source="PARENT_ID" target="ID"/> </db-relationship> - <db-relationship name="impl" source="IV_BASE" target="IV_IMPL" toDependentPK="true" toMany="false"> - <db-attribute-pair source="ID" target="ID"/> - </db-relationship> - <db-relationship name="impl" source="IV_BASE_WITH_LOCK" target="IV_IMPL_WITH_LOCK" toDependentPK="true" toMany="false"> + <db-relationship name="impl" source="IV_BASE" target="IV_IMPL" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="abstract" source="IV_CONCRETE" target="IV_ABSTRACT" toMany="false"> + <db-relationship name="impl" source="IV_BASE_WITH_LOCK" target="IV_IMPL_WITH_LOCK" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="base" source="IV_IMPL" target="IV_BASE" toMany="false"> + <db-relationship name="abstract" source="IV_CONCRETE" target="IV_ABSTRACT"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="base" source="IV_IMPL_WITH_LOCK" target="IV_BASE_WITH_LOCK" toMany="false"> + <db-relationship name="base" source="IV_IMPL" target="IV_BASE"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="other1" source="IV_IMPL" target="IV_OTHER" toMany="false"> + <db-relationship name="other1" source="IV_IMPL" target="IV_OTHER"> <db-attribute-pair source="OTHER1_ID" target="ID"/> </db-relationship> - <db-relationship name="other2" source="IV_IMPL" target="IV_OTHER" toMany="false"> + <db-relationship name="other2" source="IV_IMPL" target="IV_OTHER"> <db-attribute-pair source="OTHER2_ID" target="ID"/> </db-relationship> - <db-relationship name="other1" source="IV_IMPL_WITH_LOCK" target="IV_OTHER" toMany="false"> + <db-relationship name="base" source="IV_IMPL_WITH_LOCK" target="IV_BASE_WITH_LOCK"> + <db-attribute-pair source="ID" target="ID"/> + </db-relationship> + <db-relationship name="other1" source="IV_IMPL_WITH_LOCK" target="IV_OTHER"> <db-attribute-pair source="OTHER1_ID" target="ID"/> </db-relationship> <db-relationship name="impls" source="IV_OTHER" target="IV_IMPL" toMany="true"> @@ -210,28 +209,28 @@ <db-relationship name="ivSub3s" source="IV_ROOT" target="IV_SUB3" toMany="true"> <db-attribute-pair source="ID" target="IV_ROOT_ID"/> </db-relationship> - <db-relationship name="sub1" source="IV_ROOT" target="IV_SUB1" toDependentPK="true" toMany="false"> + <db-relationship name="sub1" source="IV_ROOT" target="IV_SUB1" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="sub2" source="IV_ROOT" target="IV_SUB2" toDependentPK="true" toMany="false"> + <db-relationship name="sub2" source="IV_ROOT" target="IV_SUB2" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="sub3" source="IV_ROOT" target="IV_SUB3" toDependentPK="true" toMany="false"> + <db-relationship name="sub3" source="IV_ROOT" target="IV_SUB3" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="master" source="IV_SUB1" target="IV_ROOT" toMany="false"> + <db-relationship name="master" source="IV_SUB1" target="IV_ROOT"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="sub1Sub1" source="IV_SUB1" target="IV_SUB1_SUB1" toDependentPK="true" toMany="false"> + <db-relationship name="sub1Sub1" source="IV_SUB1" target="IV_SUB1_SUB1" toDependentPK="true"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="master" source="IV_SUB1_SUB1" target="IV_SUB1" toMany="false"> + <db-relationship name="master" source="IV_SUB1_SUB1" target="IV_SUB1"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="master" source="IV_SUB2" target="IV_ROOT" toMany="false"> + <db-relationship name="master" source="IV_SUB2" target="IV_ROOT"> <db-attribute-pair source="ID" target="ID"/> </db-relationship> - <db-relationship name="ivRoot1" source="IV_SUB3" target="IV_ROOT" toMany="false"> + <db-relationship name="ivRoot1" source="IV_SUB3" target="IV_ROOT"> <db-attribute-pair source="IV_ROOT_ID" target="ID"/> </db-relationship> <obj-relationship name="x" source="Iv2Sub1" target="Iv2X" deleteRule="Nullify" db-relationship-path="sub1.x"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/inheritance.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/inheritance.map.xml b/cayenne-server/src/test/resources/inheritance.map.xml index df054be..ea96c45 100644 --- a/cayenne-server/src/test/resources/inheritance.map.xml +++ b/cayenne-server/src/test/resources/inheritance.map.xml @@ -1,46 +1,44 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/> - <db-entity name="BASE_ENTITY"> - <db-attribute name="BASE_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="DIRECT_TO_SUB_ENTITY_ID" type="INTEGER"/> - <db-attribute name="ENTITY_TYPE" type="VARCHAR" length="255"/> - <db-attribute name="RELATED_ENTITY_ID" type="INTEGER" isMandatory="true"/> - </db-entity> - <db-entity name="DIRECT_TO_SUB_ENTITY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="RELATED_ENTITY"> - <db-attribute name="RELATED_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <obj-entity name="BaseEntity" className="org.apache.cayenne.testdo.inheritance.BaseEntity" dbEntityName="BASE_ENTITY"> - <obj-attribute name="entityType" type="java.lang.String" db-attribute-path="ENTITY_TYPE"/> - </obj-entity> - <obj-entity name="DirectToSubEntity" className="org.apache.cayenne.testdo.inheritance.DirectToSubEntity" dbEntityName="DIRECT_TO_SUB_ENTITY"> - </obj-entity> - <obj-entity name="RelatedEntity" className="org.apache.cayenne.testdo.inheritance.RelatedEntity" dbEntityName="RELATED_ENTITY"> - </obj-entity> - <obj-entity name="SubEntity" superEntityName="BaseEntity" className="org.apache.cayenne.testdo.inheritance.SubEntity"> - <qualifier><![CDATA[entityType = "sub"]]></qualifier> - </obj-entity> - <db-relationship name="directToSubEntities" source="BASE_ENTITY" target="DIRECT_TO_SUB_ENTITY" toMany="false"> - <db-attribute-pair source="DIRECT_TO_SUB_ENTITY_ID" target="ID"/> - </db-relationship> - <db-relationship name="relatedEntities" source="BASE_ENTITY" target="RELATED_ENTITY" toMany="false"> - <db-attribute-pair source="RELATED_ENTITY_ID" target="RELATED_ENTITY_ID"/> - </db-relationship> - <db-relationship name="subEntity" source="DIRECT_TO_SUB_ENTITY" target="BASE_ENTITY" toMany="true"> - <db-attribute-pair source="ID" target="DIRECT_TO_SUB_ENTITY_ID"/> - </db-relationship> - <db-relationship name="entities" source="RELATED_ENTITY" target="BASE_ENTITY" toMany="true"> - <db-attribute-pair source="RELATED_ENTITY_ID" target="RELATED_ENTITY_ID"/> - </db-relationship> - <obj-relationship name="toDirectToSubEntity" source="BaseEntity" target="DirectToSubEntity" deleteRule="Nullify" db-relationship-path="directToSubEntities"/> - <obj-relationship name="toRelatedEntity" source="BaseEntity" target="RelatedEntity" deleteRule="Nullify" db-relationship-path="relatedEntities"/> - <obj-relationship name="subEntities" source="DirectToSubEntity" target="SubEntity" db-relationship-path="subEntity"/> - <obj-relationship name="baseEntities" source="RelatedEntity" target="BaseEntity" db-relationship-path="entities"/> - <obj-relationship name="subEntities" source="RelatedEntity" target="SubEntity" db-relationship-path="entities"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/> + <db-entity name="BASE_ENTITY"> + <db-attribute name="BASE_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="DIRECT_TO_SUB_ENTITY_ID" type="INTEGER"/> + <db-attribute name="ENTITY_TYPE" type="VARCHAR" length="255"/> + <db-attribute name="RELATED_ENTITY_ID" type="INTEGER" isMandatory="true"/> + </db-entity> + <db-entity name="DIRECT_TO_SUB_ENTITY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="RELATED_ENTITY"> + <db-attribute name="RELATED_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <obj-entity name="BaseEntity" className="org.apache.cayenne.testdo.inheritance.BaseEntity" dbEntityName="BASE_ENTITY"> + <obj-attribute name="entityType" type="java.lang.String" db-attribute-path="ENTITY_TYPE"/> + </obj-entity> + <obj-entity name="DirectToSubEntity" className="org.apache.cayenne.testdo.inheritance.DirectToSubEntity" dbEntityName="DIRECT_TO_SUB_ENTITY"/> + <obj-entity name="RelatedEntity" className="org.apache.cayenne.testdo.inheritance.RelatedEntity" dbEntityName="RELATED_ENTITY"/> + <obj-entity name="SubEntity" superEntityName="BaseEntity" className="org.apache.cayenne.testdo.inheritance.SubEntity"> + <qualifier><![CDATA[entityType = "sub"]]></qualifier> + </obj-entity> + <db-relationship name="directToSubEntities" source="BASE_ENTITY" target="DIRECT_TO_SUB_ENTITY"> + <db-attribute-pair source="DIRECT_TO_SUB_ENTITY_ID" target="ID"/> + </db-relationship> + <db-relationship name="relatedEntities" source="BASE_ENTITY" target="RELATED_ENTITY"> + <db-attribute-pair source="RELATED_ENTITY_ID" target="RELATED_ENTITY_ID"/> + </db-relationship> + <db-relationship name="subEntity" source="DIRECT_TO_SUB_ENTITY" target="BASE_ENTITY" toMany="true"> + <db-attribute-pair source="ID" target="DIRECT_TO_SUB_ENTITY_ID"/> + </db-relationship> + <db-relationship name="entities" source="RELATED_ENTITY" target="BASE_ENTITY" toMany="true"> + <db-attribute-pair source="RELATED_ENTITY_ID" target="RELATED_ENTITY_ID"/> + </db-relationship> + <obj-relationship name="toDirectToSubEntity" source="BaseEntity" target="DirectToSubEntity" deleteRule="Nullify" db-relationship-path="directToSubEntities"/> + <obj-relationship name="toRelatedEntity" source="BaseEntity" target="RelatedEntity" deleteRule="Nullify" db-relationship-path="relatedEntities"/> + <obj-relationship name="subEntities" source="DirectToSubEntity" target="SubEntity" db-relationship-path="subEntity"/> + <obj-relationship name="baseEntities" source="RelatedEntity" target="BaseEntity" db-relationship-path="entities"/> + <obj-relationship name="subEntities" source="RelatedEntity" target="SubEntity" db-relationship-path="entities"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml index 1afdc32..3d6efd9 100644 --- a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml +++ b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> - <db-entity name="LIFECYCLE"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - </db-entity> - <obj-entity name="Lifecycle" className="org.apache.cayenne.testdo.lifecycle_callbacks_order.Lifecycle" dbEntityName="LIFECYCLE"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> + <db-entity name="LIFECYCLE"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + </db-entity> + <obj-entity name="Lifecycle" className="org.apache.cayenne.testdo.lifecycle_callbacks_order.Lifecycle" dbEntityName="LIFECYCLE"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/lifecycles.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lifecycles.map.xml b/cayenne-server/src/test/resources/lifecycles.map.xml index 098b4c5..31a741b 100644 --- a/cayenne-server/src/test/resources/lifecycles.map.xml +++ b/cayenne-server/src/test/resources/lifecycles.map.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycles"/> - <db-entity name="LIFECYCLES"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> - </db-entity> - <obj-entity name="Lifecycles" className="org.apache.cayenne.testdo.lifecycles.Lifecycles" clientClassName="org.apache.cayenne.testdo.lifecycles.ClientLifecycles" dbEntityName="LIFECYCLES"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycles"/> + <db-entity name="LIFECYCLES"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> + </db-entity> + <obj-entity name="Lifecycles" className="org.apache.cayenne.testdo.lifecycles.Lifecycles" clientClassName="org.apache.cayenne.testdo.lifecycles.ClientLifecycles" dbEntityName="LIFECYCLES"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/lob.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lob.map.xml b/cayenne-server/src/test/resources/lob.map.xml index e797df7..df846e1 100644 --- a/cayenne-server/src/test/resources/lob.map.xml +++ b/cayenne-server/src/test/resources/lob.map.xml @@ -1,53 +1,53 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="BLOB_TEST"> - <db-attribute name="BLOB_COL" type="BLOB"/> - <db-attribute name="BLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="CLOB_TEST"> - <db-attribute name="CLOB_COL" type="CLOB"/> - <db-attribute name="CLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="NCLOB_TEST"> - <db-attribute name="NCLOB_COL" type="NCLOB"/> - <db-attribute name="NCLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="CLOB_TEST_RELATION"> - <db-attribute name="CVALUE" type="INTEGER"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="ID_CLOB" type="INTEGER" isMandatory="true"/> - </db-entity> - <db-entity name="TEST"> - <db-attribute name="TEST_ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="TEST_NAME" type="CHAR" isMandatory="true" length="254"/> - </db-entity> - <obj-entity name="BlobTestEntity" className="org.apache.cayenne.testdo.lob.BlobTestEntity" dbEntityName="BLOB_TEST"> - <obj-attribute name="blobCol" type="byte[]" db-attribute-path="BLOB_COL"/> - </obj-entity> - <obj-entity name="ClobTestEntity" className="org.apache.cayenne.testdo.lob.ClobTestEntity" dbEntityName="CLOB_TEST"> - <obj-attribute name="clobCol" type="java.lang.String" db-attribute-path="CLOB_COL"/> - </obj-entity> - <obj-entity name="NClobTestEntity" className="org.apache.cayenne.testdo.lob.NClobTestEntity" dbEntityName="NCLOB_TEST"> - <obj-attribute name="nclobCol" type="java.lang.String" db-attribute-path="NCLOB_COL"/> - </obj-entity> - <obj-entity name="ClobTestRelation" className="org.apache.cayenne.testdo.lob.ClobTestRelation" dbEntityName="CLOB_TEST_RELATION"> - <obj-attribute name="id" type="java.lang.Integer" db-attribute-path="ID"/> - <obj-attribute name="value" type="java.lang.Integer" db-attribute-path="CVALUE"/> - </obj-entity> - <db-relationship name="clob" source="CLOB_TEST" target="CLOB_TEST_RELATION" toMany="true"> - <db-attribute-pair source="CLOB_TEST_ID" target="ID_CLOB"/> - </db-relationship> - <db-relationship name="CLOB_REL" source="CLOB_TEST_RELATION" target="CLOB_TEST" toMany="false"> - <db-attribute-pair source="ID_CLOB" target="CLOB_TEST_ID"/> - </db-relationship> - <obj-relationship name="clobValue" source="ClobTestEntity" target="ClobTestRelation" db-relationship-path="clob"/> - <obj-relationship name="clobId" source="ClobTestRelation" target="ClobTestEntity" db-relationship-path="CLOB_REL"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="BLOB_TEST"> + <db-attribute name="BLOB_COL" type="BLOB"/> + <db-attribute name="BLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="CLOB_TEST"> + <db-attribute name="CLOB_COL" type="CLOB"/> + <db-attribute name="CLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="CLOB_TEST_RELATION"> + <db-attribute name="CVALUE" type="INTEGER"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="ID_CLOB" type="INTEGER" isMandatory="true"/> + </db-entity> + <db-entity name="NCLOB_TEST"> + <db-attribute name="NCLOB_COL" type="NCLOB"/> + <db-attribute name="NCLOB_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="TEST"> + <db-attribute name="TEST_ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="TEST_NAME" type="CHAR" isMandatory="true" length="254"/> + </db-entity> + <obj-entity name="BlobTestEntity" className="org.apache.cayenne.testdo.lob.BlobTestEntity" dbEntityName="BLOB_TEST"> + <obj-attribute name="blobCol" type="byte[]" db-attribute-path="BLOB_COL"/> + </obj-entity> + <obj-entity name="ClobTestEntity" className="org.apache.cayenne.testdo.lob.ClobTestEntity" dbEntityName="CLOB_TEST"> + <obj-attribute name="clobCol" type="java.lang.String" db-attribute-path="CLOB_COL"/> + </obj-entity> + <obj-entity name="ClobTestRelation" className="org.apache.cayenne.testdo.lob.ClobTestRelation" dbEntityName="CLOB_TEST_RELATION"> + <obj-attribute name="id" type="java.lang.Integer" db-attribute-path="ID"/> + <obj-attribute name="value" type="java.lang.Integer" db-attribute-path="CVALUE"/> + </obj-entity> + <obj-entity name="NClobTestEntity" className="org.apache.cayenne.testdo.lob.NClobTestEntity" dbEntityName="NCLOB_TEST"> + <obj-attribute name="nclobCol" type="java.lang.String" db-attribute-path="NCLOB_COL"/> + </obj-entity> + <db-relationship name="clob" source="CLOB_TEST" target="CLOB_TEST_RELATION" toMany="true"> + <db-attribute-pair source="CLOB_TEST_ID" target="ID_CLOB"/> + </db-relationship> + <db-relationship name="CLOB_REL" source="CLOB_TEST_RELATION" target="CLOB_TEST"> + <db-attribute-pair source="ID_CLOB" target="CLOB_TEST_ID"/> + </db-relationship> + <obj-relationship name="clobValue" source="ClobTestEntity" target="ClobTestRelation" db-relationship-path="clob"/> + <obj-relationship name="clobId" source="ClobTestRelation" target="ClobTestEntity" db-relationship-path="CLOB_REL"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/locking.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/locking.map.xml b/cayenne-server/src/test/resources/locking.map.xml index 9092352..54df6d1 100644 --- a/cayenne-server/src/test/resources/locking.map.xml +++ b/cayenne-server/src/test/resources/locking.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/> <db-entity name="LOCKING_HELPER"> <db-attribute name="LOCKING_HELPER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -29,13 +29,13 @@ <obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/> <obj-attribute name="name" type="java.lang.String" lock="true" db-attribute-path="NAME"/> </obj-entity> - <db-relationship name="toRelLockingTest" source="LOCKING_HELPER" target="REL_LOCKING_TEST" toMany="false"> + <db-relationship name="toRelLockingTest" source="LOCKING_HELPER" target="REL_LOCKING_TEST"> <db-attribute-pair source="REL_LOCKING_TEST_ID" target="REL_LOCKING_TEST_ID"/> </db-relationship> <db-relationship name="lockingHelpers" source="REL_LOCKING_TEST" target="LOCKING_HELPER" toMany="true"> <db-attribute-pair source="REL_LOCKING_TEST_ID" target="REL_LOCKING_TEST_ID"/> </db-relationship> - <db-relationship name="toSimpleLockingTest" source="REL_LOCKING_TEST" target="SIMPLE_LOCKING_TEST" toMany="false"> + <db-relationship name="toSimpleLockingTest" source="REL_LOCKING_TEST" target="SIMPLE_LOCKING_TEST"> <db-attribute-pair source="SIMPLE_LOCKING_TEST_ID" target="LOCKING_TEST_ID"/> </db-relationship> <db-relationship name="relaLockingTests" source="SIMPLE_LOCKING_TEST" target="REL_LOCKING_TEST" toMany="true"> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/map-db1.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-db1.map.xml b/cayenne-server/src/test/resources/map-db1.map.xml index 7d1ef52..c5f332e 100644 --- a/cayenne-server/src/test/resources/map-db1.map.xml +++ b/cayenne-server/src/test/resources/map-db1.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/> <db-entity name="CROSSDB_M1E1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/map-db2.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-db2.map.xml b/cayenne-server/src/test/resources/map-db2.map.xml index ebe3163..fd3750c 100644 --- a/cayenne-server/src/test/resources/map-db2.map.xml +++ b/cayenne-server/src/test/resources/map-db2.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/> <db-entity name="CROSSDB_M2E1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -23,10 +23,10 @@ <db-relationship name="listOfM2E2" source="CROSSDB_M2E1" target="CROSSDB_M2E2" toMany="true"> <db-attribute-pair source="ID" target="M2E1_ID"/> </db-relationship> - <db-relationship name="toM1E1" source="CROSSDB_M2E2" target="CROSSDB_M1E1" toMany="false"> + <db-relationship name="toM1E1" source="CROSSDB_M2E2" target="CROSSDB_M1E1"> <db-attribute-pair source="M1E1_ID" target="ID"/> </db-relationship> - <db-relationship name="toM2E1" source="CROSSDB_M2E2" target="CROSSDB_M2E1" toMany="false"> + <db-relationship name="toM2E1" source="CROSSDB_M2E2" target="CROSSDB_M2E1"> <db-attribute-pair source="M2E1_ID" target="ID"/> </db-relationship> <obj-relationship name="listOfM2E2" source="CrossdbM2E1" target="CrossdbM2E2" db-relationship-path="listOfM2E2"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/map-to-many.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-to-many.map.xml b/cayenne-server/src/test/resources/map-to-many.map.xml index 99dce4d..7852632 100644 --- a/cayenne-server/src/test/resources/map-to-many.map.xml +++ b/cayenne-server/src/test/resources/map-to-many.map.xml @@ -1,57 +1,46 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.map_to_many"/> - - <db-entity name="ID_MAP_TO_MANY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="ID_MAP_TO_MANY_TARGET"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="MAP_TO_MANY_ID" type="INTEGER"/> - </db-entity> - - <db-entity name="MAP_TO_MANY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="MAP_TO_MANY_TARGET"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="MAP_TO_MANY_ID" type="INTEGER"/> - <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> - </db-entity> - - <obj-entity name="IdMapToMany" className="org.apache.cayenne.testdo.map_to_many.IdMapToMany" clientClassName="org.apache.cayenne.testdo.map_to_many.ClientIdMapToMany" dbEntityName="ID_MAP_TO_MANY"> - </obj-entity> - <obj-entity name="IdMapToManyTarget" className="org.apache.cayenne.testdo.map_to_many.IdMapToManyTarget" clientClassName="org.apache.cayenne.testdo.map_to_many.ClientIdMapToManyTarget" dbEntityName="ID_MAP_TO_MANY_TARGET"> - </obj-entity> - - <obj-entity name="MapToMany" className="org.apache.cayenne.testdo.map_to_many.MapToMany" dbEntityName="MAP_TO_MANY"> - </obj-entity> - <obj-entity name="MapToManyTarget" className="org.apache.cayenne.testdo.map_to_many.MapToManyTarget" dbEntityName="MAP_TO_MANY_TARGET"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - - <db-relationship name="targets" source="ID_MAP_TO_MANY" target="ID_MAP_TO_MANY_TARGET" toMany="true"> - <db-attribute-pair source="ID" target="MAP_TO_MANY_ID"/> - </db-relationship> - <db-relationship name="mapToMany" source="ID_MAP_TO_MANY_TARGET" target="ID_MAP_TO_MANY" toMany="false"> - <db-attribute-pair source="MAP_TO_MANY_ID" target="ID"/> - </db-relationship> - - <db-relationship name="targets" source="MAP_TO_MANY" target="MAP_TO_MANY_TARGET" toMany="true"> - <db-attribute-pair source="ID" target="MAP_TO_MANY_ID"/> - </db-relationship> - <db-relationship name="mapToMany" source="MAP_TO_MANY_TARGET" target="MAP_TO_MANY" toMany="false"> - <db-attribute-pair source="MAP_TO_MANY_ID" target="ID"/> - </db-relationship> - - <obj-relationship name="targets" source="IdMapToMany" target="IdMapToManyTarget" collection-type="java.util.Map" db-relationship-path="targets"/> - <obj-relationship name="mapToMany" source="IdMapToManyTarget" target="IdMapToMany" db-relationship-path="mapToMany"/> - - <obj-relationship name="targets" source="MapToMany" target="MapToManyTarget" collection-type="java.util.Map" map-key="name" db-relationship-path="targets"/> - <obj-relationship name="mapToMany" source="MapToManyTarget" target="MapToMany" db-relationship-path="mapToMany"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.map_to_many"/> + <db-entity name="ID_MAP_TO_MANY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="ID_MAP_TO_MANY_TARGET"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="MAP_TO_MANY_ID" type="INTEGER"/> + </db-entity> + <db-entity name="MAP_TO_MANY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="MAP_TO_MANY_TARGET"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="MAP_TO_MANY_ID" type="INTEGER"/> + <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> + </db-entity> + <obj-entity name="IdMapToMany" className="org.apache.cayenne.testdo.map_to_many.IdMapToMany" clientClassName="org.apache.cayenne.testdo.map_to_many.ClientIdMapToMany" dbEntityName="ID_MAP_TO_MANY"/> + <obj-entity name="IdMapToManyTarget" className="org.apache.cayenne.testdo.map_to_many.IdMapToManyTarget" clientClassName="org.apache.cayenne.testdo.map_to_many.ClientIdMapToManyTarget" dbEntityName="ID_MAP_TO_MANY_TARGET"/> + <obj-entity name="MapToMany" className="org.apache.cayenne.testdo.map_to_many.MapToMany" dbEntityName="MAP_TO_MANY"/> + <obj-entity name="MapToManyTarget" className="org.apache.cayenne.testdo.map_to_many.MapToManyTarget" dbEntityName="MAP_TO_MANY_TARGET"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <db-relationship name="targets" source="ID_MAP_TO_MANY" target="ID_MAP_TO_MANY_TARGET" toMany="true"> + <db-attribute-pair source="ID" target="MAP_TO_MANY_ID"/> + </db-relationship> + <db-relationship name="mapToMany" source="ID_MAP_TO_MANY_TARGET" target="ID_MAP_TO_MANY"> + <db-attribute-pair source="MAP_TO_MANY_ID" target="ID"/> + </db-relationship> + <db-relationship name="targets" source="MAP_TO_MANY" target="MAP_TO_MANY_TARGET" toMany="true"> + <db-attribute-pair source="ID" target="MAP_TO_MANY_ID"/> + </db-relationship> + <db-relationship name="mapToMany" source="MAP_TO_MANY_TARGET" target="MAP_TO_MANY"> + <db-attribute-pair source="MAP_TO_MANY_ID" target="ID"/> + </db-relationship> + <obj-relationship name="targets" source="IdMapToMany" target="IdMapToManyTarget" collection-type="java.util.Map" db-relationship-path="targets"/> + <obj-relationship name="mapToMany" source="IdMapToManyTarget" target="IdMapToMany" db-relationship-path="mapToMany"/> + <obj-relationship name="targets" source="MapToMany" target="MapToManyTarget" collection-type="java.util.Map" map-key="name" db-relationship-path="targets"/> + <obj-relationship name="mapToMany" source="MapToManyTarget" target="MapToMany" db-relationship-path="mapToMany"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/meaningful-pk.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/meaningful-pk.map.xml b/cayenne-server/src/test/resources/meaningful-pk.map.xml index ca41207..15e3462 100644 --- a/cayenne-server/src/test/resources/meaningful-pk.map.xml +++ b/cayenne-server/src/test/resources/meaningful-pk.map.xml @@ -1,39 +1,39 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> - <db-entity name="MEANINGFUL_PK"> - <db-attribute name="PK" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="100"/> - </db-entity> - <db-entity name="MEANINGFUL_PK_DEP"> - <db-attribute name="DESCR" type="VARCHAR" length="50"/> - <db-attribute name="MASTER_PK" type="INTEGER"/> - <db-attribute name="PK_ATTRIBUTE" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="MEANINGFUL_PK_TEST1"> - <db-attribute name="DESCR" type="VARCHAR" length="50"/> - <db-attribute name="PK_ATTRIBUTE" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <obj-entity name="MeaningfulPk" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPk" clientClassName="org.apache.cayenne.testdo.meaningful_pk.ClientMeaningfulPk" dbEntityName="MEANINGFUL_PK"> - <obj-attribute name="pk" type="java.lang.String" db-attribute-path="PK"/> - </obj-entity> - <obj-entity name="MeaningfulPKDep" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKDep" dbEntityName="MEANINGFUL_PK_DEP"> - <obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/> - </obj-entity> - <obj-entity name="MeaningfulPKTest1" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKTest1" dbEntityName="MEANINGFUL_PK_TEST1"> - <obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/> - <obj-attribute name="pkAttribute" type="java.lang.Integer" db-attribute-path="PK_ATTRIBUTE"/> - </obj-entity> - <db-relationship name="toMeaningfulPK" source="MEANINGFUL_PK_DEP" target="MEANINGFUL_PK_TEST1" toMany="false"> - <db-attribute-pair source="MASTER_PK" target="PK_ATTRIBUTE"/> - </db-relationship> - <db-relationship name="meaningfulPKDepArray" source="MEANINGFUL_PK_TEST1" target="MEANINGFUL_PK_DEP" toMany="true"> - <db-attribute-pair source="PK_ATTRIBUTE" target="MASTER_PK"/> - </db-relationship> - <obj-relationship name="toMeaningfulPK" source="MeaningfulPKDep" target="MeaningfulPKTest1" db-relationship-path="toMeaningfulPK"/> - <obj-relationship name="meaningfulPKDepArray" source="MeaningfulPKTest1" target="MeaningfulPKDep" db-relationship-path="meaningfulPKDepArray"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> + <db-entity name="MEANINGFUL_PK"> + <db-attribute name="PK" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="100"/> + </db-entity> + <db-entity name="MEANINGFUL_PK_DEP"> + <db-attribute name="DESCR" type="VARCHAR" length="50"/> + <db-attribute name="MASTER_PK" type="INTEGER"/> + <db-attribute name="PK_ATTRIBUTE" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="MEANINGFUL_PK_TEST1"> + <db-attribute name="DESCR" type="VARCHAR" length="50"/> + <db-attribute name="PK_ATTRIBUTE" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <obj-entity name="MeaningfulPKDep" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKDep" dbEntityName="MEANINGFUL_PK_DEP"> + <obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/> + </obj-entity> + <obj-entity name="MeaningfulPKTest1" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPKTest1" dbEntityName="MEANINGFUL_PK_TEST1"> + <obj-attribute name="descr" type="java.lang.String" db-attribute-path="DESCR"/> + <obj-attribute name="pkAttribute" type="java.lang.Integer" db-attribute-path="PK_ATTRIBUTE"/> + </obj-entity> + <obj-entity name="MeaningfulPk" className="org.apache.cayenne.testdo.meaningful_pk.MeaningfulPk" clientClassName="org.apache.cayenne.testdo.meaningful_pk.ClientMeaningfulPk" dbEntityName="MEANINGFUL_PK"> + <obj-attribute name="pk" type="java.lang.String" db-attribute-path="PK"/> + </obj-entity> + <db-relationship name="toMeaningfulPK" source="MEANINGFUL_PK_DEP" target="MEANINGFUL_PK_TEST1"> + <db-attribute-pair source="MASTER_PK" target="PK_ATTRIBUTE"/> + </db-relationship> + <db-relationship name="meaningfulPKDepArray" source="MEANINGFUL_PK_TEST1" target="MEANINGFUL_PK_DEP" toMany="true"> + <db-attribute-pair source="PK_ATTRIBUTE" target="MASTER_PK"/> + </db-relationship> + <obj-relationship name="toMeaningfulPK" source="MeaningfulPKDep" target="MeaningfulPKTest1" db-relationship-path="toMeaningfulPK"/> + <obj-relationship name="meaningfulPKDepArray" source="MeaningfulPKTest1" target="MeaningfulPKDep" db-relationship-path="meaningfulPKDepArray"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/misc-types.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/misc-types.map.xml b/cayenne-server/src/test/resources/misc-types.map.xml index 616ab44..59ed67c 100644 --- a/cayenne-server/src/test/resources/misc-types.map.xml +++ b/cayenne-server/src/test/resources/misc-types.map.xml @@ -1,38 +1,38 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.misc_types"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="ARRAYS_ENTITY"> - <db-attribute name="BYTE_ARRAY" type="VARBINARY" length="200"/> - <db-attribute name="BYTE_WRAPPER_ARRAY" type="VARBINARY" length="200"/> - <db-attribute name="CHAR_ARRAY" type="VARCHAR" length="200"/> - <db-attribute name="CHAR_WRAPPER_ARRAY" type="VARCHAR" length="200"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="CHARACTER_ENTITY"> - <db-attribute name="CHARACTER_FIELD" type="CHAR" length="1"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="SERIALIZABLE_ENTITY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="SERIALIZABLE_FIELD" type="BLOB"/> - </db-entity> - <obj-entity name="ArraysEntity" className="org.apache.cayenne.testdo.misc_types.ArraysEntity" dbEntityName="ARRAYS_ENTITY"> - <obj-attribute name="byteArray" type="byte[]" db-attribute-path="BYTE_ARRAY"/> - <obj-attribute name="byteWrapperArray" type="java.lang.Byte[]" db-attribute-path="BYTE_WRAPPER_ARRAY"/> - <obj-attribute name="charArray" type="char[]" db-attribute-path="CHAR_ARRAY"/> - <obj-attribute name="charWrapperArray" type="java.lang.Character[]" db-attribute-path="CHAR_WRAPPER_ARRAY"/> - </obj-entity> - <obj-entity name="CharacterEntity" className="org.apache.cayenne.testdo.misc_types.CharacterEntity" dbEntityName="CHARACTER_ENTITY"> - <obj-attribute name="characterField" type="java.lang.Character" db-attribute-path="CHARACTER_FIELD"/> - </obj-entity> - <obj-entity name="SerializableEntity" className="org.apache.cayenne.testdo.misc_types.SerializableEntity" dbEntityName="SERIALIZABLE_ENTITY"> - <obj-attribute name="serializableField" type="org.apache.cayenne.MockSerializable" db-attribute-path="SERIALIZABLE_FIELD"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.misc_types"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="ARRAYS_ENTITY"> + <db-attribute name="BYTE_ARRAY" type="VARBINARY" length="200"/> + <db-attribute name="BYTE_WRAPPER_ARRAY" type="VARBINARY" length="200"/> + <db-attribute name="CHAR_ARRAY" type="VARCHAR" length="200"/> + <db-attribute name="CHAR_WRAPPER_ARRAY" type="VARCHAR" length="200"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="CHARACTER_ENTITY"> + <db-attribute name="CHARACTER_FIELD" type="CHAR" length="1"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="SERIALIZABLE_ENTITY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="SERIALIZABLE_FIELD" type="BLOB"/> + </db-entity> + <obj-entity name="ArraysEntity" className="org.apache.cayenne.testdo.misc_types.ArraysEntity" dbEntityName="ARRAYS_ENTITY"> + <obj-attribute name="byteArray" type="byte[]" db-attribute-path="BYTE_ARRAY"/> + <obj-attribute name="byteWrapperArray" type="java.lang.Byte[]" db-attribute-path="BYTE_WRAPPER_ARRAY"/> + <obj-attribute name="charArray" type="char[]" db-attribute-path="CHAR_ARRAY"/> + <obj-attribute name="charWrapperArray" type="java.lang.Character[]" db-attribute-path="CHAR_WRAPPER_ARRAY"/> + </obj-entity> + <obj-entity name="CharacterEntity" className="org.apache.cayenne.testdo.misc_types.CharacterEntity" dbEntityName="CHARACTER_ENTITY"> + <obj-attribute name="characterField" type="java.lang.Character" db-attribute-path="CHARACTER_FIELD"/> + </obj-entity> + <obj-entity name="SerializableEntity" className="org.apache.cayenne.testdo.misc_types.SerializableEntity" dbEntityName="SERIALIZABLE_ENTITY"> + <obj-attribute name="serializableField" type="org.apache.cayenne.MockSerializable" db-attribute-path="SERIALIZABLE_FIELD"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml index d800e13..e8aa9f5 100644 --- a/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml +++ b/cayenne-server/src/test/resources/mixed-persistence-strategy.map.xml @@ -1,36 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.mixed_persistence_strategy"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="MIXED_PERSISTENCE_STRATEGY"> - <db-attribute name="DESCRIPTION" type="VARCHAR" length="200"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="MIXED_PERSISTENCE_STRATEGY2"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="MASTER_ID" type="INTEGER"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <obj-entity name="MixedPersistenceStrategy" className="org.apache.cayenne.testdo.mixed_persistence_strategy.MixedPersistenceStrategy" dbEntityName="MIXED_PERSISTENCE_STRATEGY"> - <obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="MixedPersistenceStrategy2" className="org.apache.cayenne.testdo.mixed_persistence_strategy.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <db-relationship name="details" source="MIXED_PERSISTENCE_STRATEGY" target="MIXED_PERSISTENCE_STRATEGY2" toMany="true"> - <db-attribute-pair source="ID" target="MASTER_ID"/> - </db-relationship> - <db-relationship name="master" source="MIXED_PERSISTENCE_STRATEGY2" target="MIXED_PERSISTENCE_STRATEGY" toMany="false"> - <db-attribute-pair source="MASTER_ID" target="ID"/> - </db-relationship> - <obj-relationship name="details" source="MixedPersistenceStrategy" target="MixedPersistenceStrategy2" db-relationship-path="details"/> - <obj-relationship name="master" source="MixedPersistenceStrategy2" target="MixedPersistenceStrategy" db-relationship-path="master"/> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.mixed_persistence_strategy"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="MIXED_PERSISTENCE_STRATEGY"> + <db-attribute name="DESCRIPTION" type="VARCHAR" length="200"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="MIXED_PERSISTENCE_STRATEGY2"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="MASTER_ID" type="INTEGER"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <obj-entity name="MixedPersistenceStrategy" className="org.apache.cayenne.testdo.mixed_persistence_strategy.MixedPersistenceStrategy" dbEntityName="MIXED_PERSISTENCE_STRATEGY"> + <obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="MixedPersistenceStrategy2" className="org.apache.cayenne.testdo.mixed_persistence_strategy.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <db-relationship name="details" source="MIXED_PERSISTENCE_STRATEGY" target="MIXED_PERSISTENCE_STRATEGY2" toMany="true"> + <db-attribute-pair source="ID" target="MASTER_ID"/> + </db-relationship> + <db-relationship name="master" source="MIXED_PERSISTENCE_STRATEGY2" target="MIXED_PERSISTENCE_STRATEGY"> + <db-attribute-pair source="MASTER_ID" target="ID"/> + </db-relationship> + <obj-relationship name="details" source="MixedPersistenceStrategy" target="MixedPersistenceStrategy2" db-relationship-path="details"/> + <obj-relationship name="master" source="MixedPersistenceStrategy2" target="MixedPersistenceStrategy" db-relationship-path="master"/> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/multi-tier.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/multi-tier.map.xml b/cayenne-server/src/test/resources/multi-tier.map.xml index 016fc58..a63f0a3 100644 --- a/cayenne-server/src/test/resources/multi-tier.map.xml +++ b/cayenne-server/src/test/resources/multi-tier.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.mt"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.mt"/> @@ -54,23 +54,21 @@ <obj-attribute name="charColumn" type="java.lang.String" db-attribute-path="CHAR_COLUMN"/> <obj-attribute name="intColumn" type="java.lang.Integer" db-attribute-path="INT_COLUMN"/> </obj-entity> - <obj-entity name="MtTable4" className="org.apache.cayenne.testdo.mt.MtTable4" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable4" dbEntityName="MT_TABLE4"> - </obj-entity> - <obj-entity name="MtTable5" className="org.apache.cayenne.testdo.mt.MtTable5" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable5" dbEntityName="MT_TABLE5"> - </obj-entity> - <db-relationship name="toTable4" source="MT_JOIN45" target="MT_TABLE4" toMany="false"> + <obj-entity name="MtTable4" className="org.apache.cayenne.testdo.mt.MtTable4" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable4" dbEntityName="MT_TABLE4"/> + <obj-entity name="MtTable5" className="org.apache.cayenne.testdo.mt.MtTable5" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable5" dbEntityName="MT_TABLE5"/> + <db-relationship name="toTable4" source="MT_JOIN45" target="MT_TABLE4"> <db-attribute-pair source="TABLE4_ID" target="ID"/> </db-relationship> - <db-relationship name="toTable5" source="MT_JOIN45" target="MT_TABLE5" toMany="false"> + <db-relationship name="toTable5" source="MT_JOIN45" target="MT_TABLE5"> <db-attribute-pair source="TABLE5_ID" target="ID"/> </db-relationship> <db-relationship name="table2Array" source="MT_TABLE1" target="MT_TABLE2" toMany="true"> <db-attribute-pair source="TABLE1_ID" target="TABLE1_ID"/> </db-relationship> - <db-relationship name="table1" source="MT_TABLE2" target="MT_TABLE1" toMany="false"> + <db-relationship name="table1" source="MT_TABLE2" target="MT_TABLE1"> <db-attribute-pair source="TABLE1_ID" target="TABLE1_ID"/> </db-relationship> - <db-relationship name="table3" source="MT_TABLE2" target="MT_TABLE3" toMany="false"> + <db-relationship name="table3" source="MT_TABLE2" target="MT_TABLE3"> <db-attribute-pair source="TABLE3_ID" target="TABLE3_ID"/> </db-relationship> <db-relationship name="table2Array" source="MT_TABLE3" target="MT_TABLE2" toMany="true"> @@ -88,8 +86,7 @@ <obj-relationship name="table2Array" source="MtTable3" target="MtTable2" deleteRule="Deny" db-relationship-path="table2Array"/> <obj-relationship name="table5s" source="MtTable4" target="MtTable5" db-relationship-path="joins.toTable5"/> <obj-relationship name="table4s" source="MtTable5" target="MtTable4" db-relationship-path="joins.toTable4"/> - <query name="AllMtTable1" type="SelectQuery" root="obj-entity" root-name="MtTable1"> - </query> + <query name="AllMtTable1" type="SelectQuery" root="obj-entity" root-name="MtTable1"/> <query name="MtQueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="MtTable1"> <property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/> </query> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/no-pk.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/no-pk.map.xml b/cayenne-server/src/test/resources/no-pk.map.xml index 37f913a..27fe104 100644 --- a/cayenne-server/src/test/resources/no-pk.map.xml +++ b/cayenne-server/src/test/resources/no-pk.map.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.no_pk"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="NO_PK_TEST"> - <db-attribute name="ATTRIBUTE1" type="INTEGER"/> - </db-entity> - <obj-entity name="NoPkTestEntity" className="org.apache.cayenne.testdo.no_pk.NoPkTestEntity" dbEntityName="NO_PK_TEST"> - <obj-attribute name="attribute1" type="java.lang.Integer" db-attribute-path="ATTRIBUTE1"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.no_pk"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="NO_PK_TEST"> + <db-attribute name="ATTRIBUTE1" type="INTEGER"/> + </db-entity> + <obj-entity name="NoPkTestEntity" className="org.apache.cayenne.testdo.no_pk.NoPkTestEntity" dbEntityName="NO_PK_TEST"> + <obj-attribute name="attribute1" type="java.lang.Integer" db-attribute-path="ATTRIBUTE1"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/numeric-types.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/numeric-types.map.xml b/cayenne-server/src/test/resources/numeric-types.map.xml index 179add2..65d4000 100644 --- a/cayenne-server/src/test/resources/numeric-types.map.xml +++ b/cayenne-server/src/test/resources/numeric-types.map.xml @@ -1,79 +1,79 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.numeric_types"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="BIGDECIMAL_ENTITY"> - <db-attribute name="BIGDECIMAL_FIELD" type="NUMERIC" length="12" scale="2"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="BIGINTEGER_ENTITY"> - <db-attribute name="BIG_INTEGER_FIELD" type="BIGINT"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="BIT_TEST"> - <db-attribute name="BIT_COLUMN" type="BIT" isMandatory="true"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="BOOLEAN_TEST"> - <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN" isMandatory="true"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="DECIMAL_PK_TST"> - <db-attribute name="DECIMAL_PK" type="DECIMAL" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - </db-entity> - <db-entity name="FLOAT_TEST"> - <db-attribute name="FLOAT_COL" type="FLOAT"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="LONG_ENTITY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="LONG_FIELD" type="BIGINT"/> - </db-entity> - <db-entity name="SMALLINT_TEST"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="SMALLINT_COL" type="SMALLINT"/> - </db-entity> - <db-entity name="TINYINT_TEST"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="TINYINT_COL" type="TINYINT"/> - </db-entity> - <obj-entity name="BigDecimalEntity" className="org.apache.cayenne.testdo.numeric_types.BigDecimalEntity" dbEntityName="BIGDECIMAL_ENTITY"> - <obj-attribute name="bigDecimalField" type="java.math.BigDecimal" db-attribute-path="BIGDECIMAL_FIELD"/> - </obj-entity> - <obj-entity name="BigIntegerEntity" className="org.apache.cayenne.testdo.numeric_types.BigIntegerEntity" dbEntityName="BIGINTEGER_ENTITY"> - <obj-attribute name="bigIntegerField" type="java.math.BigInteger" db-attribute-path="BIG_INTEGER_FIELD"/> - </obj-entity> - <obj-entity name="BitNumberTestEntity" className="org.apache.cayenne.testdo.numeric_types.BitNumberTestEntity" dbEntityName="BIT_TEST"> - <obj-attribute name="bitColumn" type="java.lang.Integer" db-attribute-path="BIT_COLUMN"/> - </obj-entity> - <obj-entity name="BitTestEntity" className="org.apache.cayenne.testdo.numeric_types.BitTestEntity" dbEntityName="BIT_TEST"> - <obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/> - </obj-entity> - <obj-entity name="BooleanTestEntity" className="org.apache.cayenne.testdo.numeric_types.BooleanTestEntity" dbEntityName="BOOLEAN_TEST"> - <obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/> - </obj-entity> - <obj-entity name="DecimalPKTest1" className="org.apache.cayenne.testdo.numeric_types.DecimalPKTest1" dbEntityName="DECIMAL_PK_TST"> - <obj-attribute name="decimalPK" type="java.lang.Double" db-attribute-path="DECIMAL_PK"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="DecimalPKTestEntity" className="org.apache.cayenne.testdo.numeric_types.DecimalPKTestEntity" dbEntityName="DECIMAL_PK_TST"> - <obj-attribute name="decimalPK" type="java.math.BigDecimal" db-attribute-path="DECIMAL_PK"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="LongEntity" className="org.apache.cayenne.testdo.numeric_types.LongEntity" dbEntityName="LONG_ENTITY"> - <obj-attribute name="longField" type="java.lang.Long" db-attribute-path="LONG_FIELD"/> - </obj-entity> - <obj-entity name="SmallintTestEntity" className="org.apache.cayenne.testdo.numeric_types.SmallintTestEntity" dbEntityName="SMALLINT_TEST"> - <obj-attribute name="smallintCol" type="java.lang.Short" db-attribute-path="SMALLINT_COL"/> - </obj-entity> - <obj-entity name="TinyintTestEntity" className="org.apache.cayenne.testdo.numeric_types.TinyintTestEntity" dbEntityName="TINYINT_TEST"> - <obj-attribute name="tinyintCol" type="java.lang.Byte" db-attribute-path="TINYINT_COL"/> - </obj-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.numeric_types"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="BIGDECIMAL_ENTITY"> + <db-attribute name="BIGDECIMAL_FIELD" type="NUMERIC" length="12" scale="2"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="BIGINTEGER_ENTITY"> + <db-attribute name="BIG_INTEGER_FIELD" type="BIGINT"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="BIT_TEST"> + <db-attribute name="BIT_COLUMN" type="BIT" isMandatory="true"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="BOOLEAN_TEST"> + <db-attribute name="BOOLEAN_COLUMN" type="BOOLEAN" isMandatory="true"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="DECIMAL_PK_TST"> + <db-attribute name="DECIMAL_PK" type="DECIMAL" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + </db-entity> + <db-entity name="FLOAT_TEST"> + <db-attribute name="FLOAT_COL" type="FLOAT"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="LONG_ENTITY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="LONG_FIELD" type="BIGINT"/> + </db-entity> + <db-entity name="SMALLINT_TEST"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="SMALLINT_COL" type="SMALLINT"/> + </db-entity> + <db-entity name="TINYINT_TEST"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="TINYINT_COL" type="TINYINT"/> + </db-entity> + <obj-entity name="BigDecimalEntity" className="org.apache.cayenne.testdo.numeric_types.BigDecimalEntity" dbEntityName="BIGDECIMAL_ENTITY"> + <obj-attribute name="bigDecimalField" type="java.math.BigDecimal" db-attribute-path="BIGDECIMAL_FIELD"/> + </obj-entity> + <obj-entity name="BigIntegerEntity" className="org.apache.cayenne.testdo.numeric_types.BigIntegerEntity" dbEntityName="BIGINTEGER_ENTITY"> + <obj-attribute name="bigIntegerField" type="java.math.BigInteger" db-attribute-path="BIG_INTEGER_FIELD"/> + </obj-entity> + <obj-entity name="BitNumberTestEntity" className="org.apache.cayenne.testdo.numeric_types.BitNumberTestEntity" dbEntityName="BIT_TEST"> + <obj-attribute name="bitColumn" type="java.lang.Integer" db-attribute-path="BIT_COLUMN"/> + </obj-entity> + <obj-entity name="BitTestEntity" className="org.apache.cayenne.testdo.numeric_types.BitTestEntity" dbEntityName="BIT_TEST"> + <obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/> + </obj-entity> + <obj-entity name="BooleanTestEntity" className="org.apache.cayenne.testdo.numeric_types.BooleanTestEntity" dbEntityName="BOOLEAN_TEST"> + <obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/> + </obj-entity> + <obj-entity name="DecimalPKTest1" className="org.apache.cayenne.testdo.numeric_types.DecimalPKTest1" dbEntityName="DECIMAL_PK_TST"> + <obj-attribute name="decimalPK" type="java.lang.Double" db-attribute-path="DECIMAL_PK"/> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="DecimalPKTestEntity" className="org.apache.cayenne.testdo.numeric_types.DecimalPKTestEntity" dbEntityName="DECIMAL_PK_TST"> + <obj-attribute name="decimalPK" type="java.math.BigDecimal" db-attribute-path="DECIMAL_PK"/> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="LongEntity" className="org.apache.cayenne.testdo.numeric_types.LongEntity" dbEntityName="LONG_ENTITY"> + <obj-attribute name="longField" type="java.lang.Long" db-attribute-path="LONG_FIELD"/> + </obj-entity> + <obj-entity name="SmallintTestEntity" className="org.apache.cayenne.testdo.numeric_types.SmallintTestEntity" dbEntityName="SMALLINT_TEST"> + <obj-attribute name="smallintCol" type="java.lang.Short" db-attribute-path="SMALLINT_COL"/> + </obj-entity> + <obj-entity name="TinyintTestEntity" className="org.apache.cayenne.testdo.numeric_types.TinyintTestEntity" dbEntityName="TINYINT_TEST"> + <obj-attribute name="tinyintCol" type="java.lang.Byte" db-attribute-path="TINYINT_COL"/> + </obj-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/oneway-rels.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/oneway-rels.map.xml b/cayenne-server/src/test/resources/oneway-rels.map.xml index 9ce6d58..4d33b2c 100644 --- a/cayenne-server/src/test/resources/oneway-rels.map.xml +++ b/cayenne-server/src/test/resources/oneway-rels.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.oneway"/> <db-entity name="oneway_table1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -18,16 +18,13 @@ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> <db-attribute name="TABLE3_ID" type="INTEGER"/> </db-entity> - <obj-entity name="OnewayTable1" className="org.apache.cayenne.testdo.oneway.OnewayTable1" dbEntityName="oneway_table1"> - </obj-entity> + <obj-entity name="OnewayTable1" className="org.apache.cayenne.testdo.oneway.OnewayTable1" dbEntityName="oneway_table1"/> <obj-entity name="OnewayTable2" className="org.apache.cayenne.testdo.oneway.OnewayTable2" dbEntityName="oneway_table2"> <obj-attribute name="id" type="java.lang.Integer" db-attribute-path="ID"/> </obj-entity> - <obj-entity name="OnewayTable3" className="org.apache.cayenne.testdo.oneway.OnewayTable3" dbEntityName="oneway_table3"> - </obj-entity> - <obj-entity name="OnewayTable4" className="org.apache.cayenne.testdo.oneway.OnewayTable4" dbEntityName="oneway_table4"> - </obj-entity> - <db-relationship name="toOneOneWayDb" source="oneway_table2" target="oneway_table1" toMany="false"> + <obj-entity name="OnewayTable3" className="org.apache.cayenne.testdo.oneway.OnewayTable3" dbEntityName="oneway_table3"/> + <obj-entity name="OnewayTable4" className="org.apache.cayenne.testdo.oneway.OnewayTable4" dbEntityName="oneway_table4"/> + <db-relationship name="toOneOneWayDb" source="oneway_table2" target="oneway_table1"> <db-attribute-pair source="TABLE1_ID" target="ID"/> </db-relationship> <db-relationship name="toManyOneWayDb" source="oneway_table3" target="oneway_table4" toMany="true"> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig1.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig1.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig1.xml deleted file mode 100644 index 1f6a999..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig1.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<domain project-version="6"> - -</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig2.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig2.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig2.xml deleted file mode 100644 index cefcfcc..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig2.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<domain project-version="6"> - <map name="testConfigMap2" location="testConfigMap2.map.xml"/> -</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig3.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig3.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig3.xml deleted file mode 100644 index 1a2e3e5..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/cayenne-testConfig3.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<domain project-version="6"> - <map name="testConfigMap3_1" location="testConfigMap3_1.map.xml" /> - <map name="testConfigMap3_2" location="testConfigMap3_2.map.xml" /> - - <node name="testConfigNode3" adapter="org.example.test.Adapter" - factory="org.example.test.DataSourceFactory" schema-update-strategy="org.example.test.SchemaUpdateStartegy"> - <map-ref name="testConfigMap3_2" /> - <data-source> - <connectionPool min="1" max="1" /> - <login /> - </data-source> - </node> -</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap2.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap2.map.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap2.map.xml deleted file mode 100644 index 6b79eb5..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap2.map.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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"> - -</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_1.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_1.map.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_1.map.xml deleted file mode 100644 index 6b79eb5..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_1.map.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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"> - -</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_2.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_2.map.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_2.map.xml deleted file mode 100644 index 6b79eb5..0000000 --- a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/testConfigMap3_2.map.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?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"> - -</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.xml new file mode 100644 index 0000000..f941c79 --- /dev/null +++ b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbEntityHandlerTest.xml @@ -0,0 +1,25 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<db-entity name="ARTGROUP" catalog="catalog" schema="schema"> + <db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" isGenerated="true"/> + <db-attribute name="NAME" type="VARCHAR" isMandatory="true" length="100"/> + <db-attribute name="PARENT_GROUP_ID" type="BIT" scale="10"/> + <qualifier><![CDATA[name = "test"]]></qualifier> +</db-entity> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.xml new file mode 100644 index 0000000..dc0291a --- /dev/null +++ b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbKeyGeneratorHandlerTest.xml @@ -0,0 +1,24 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<db-key-generator> + <db-generator-type>ORACLE</db-generator-type> + <db-generator-name>gallery_seq</db-generator-name> + <db-key-cache-size>20</db-key-cache-size> +</db-key-generator> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.xml b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.xml new file mode 100644 index 0000000..dfaed06 --- /dev/null +++ b/cayenne-server/src/test/resources/org/apache/cayenne/configuration/xml/DbRelationshipHandlerTest.xml @@ -0,0 +1,22 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<db-relationship name="artistPaintings" source="ARTIST" target="PAINTING" toDependentPK="true" toMany="true"> + <db-attribute-pair source="ID" target="ARTIST_ID"/> +</db-relationship>
