Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap.map.xml URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap.map.xml?rev=422603&r1=422602&r2=422603&view=diff ============================================================================== --- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap.map.xml (original) +++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap.map.xml Sun Jul 16 19:35:13 2006 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <data-map project-version="1.1"> - <property name="defaultPackage" value="org.objectstyle.art"/> + <property name="defaultPackage" value="org.apache.art"/> <procedure name="cayenne_tst_out_proc"> <procedure-parameter name="in_param" type="INTEGER" direction="in"/> <procedure-parameter name="out_param" type="INTEGER" direction="out"/> @@ -182,154 +182,154 @@ <db-attribute-ref name="PAINTING_ID"/> </db-attribute-derived> </db-entity> - <obj-entity name="ArtGroup" className="org.objectstyle.art.ArtGroup" dbEntityName="ARTGROUP"> + <obj-entity name="ArtGroup" className="org.apache.art.ArtGroup" dbEntityName="ARTGROUP"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="Artist" className="org.objectstyle.art.Artist" dbEntityName="ARTIST"> + <obj-entity name="Artist" className="org.apache.art.Artist" dbEntityName="ARTIST"> <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/> <obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/> </obj-entity> - <obj-entity name="ArtistAssets" className="org.objectstyle.art.ArtistAssets" dbEntityName="ARTIST_ASSETS"> + <obj-entity name="ArtistAssets" className="org.apache.art.ArtistAssets" dbEntityName="ARTIST_ASSETS"> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="paintingsCount" type="java.lang.Integer" db-attribute-path="PAINTINGS_COUNT"/> </obj-entity> - <obj-entity name="ArtistExhibit" className="org.objectstyle.art.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT"> + <obj-entity name="ArtistExhibit" className="org.apache.art.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT"> </obj-entity> - <obj-entity name="ArtistPaintingCounts" className="org.objectstyle.art.ArtistPaintingCounts" dbEntityName="ARTIST_ASSETS"> + <obj-entity name="ArtistPaintingCounts" className="org.apache.art.ArtistPaintingCounts" dbEntityName="ARTIST_ASSETS"> <obj-attribute name="paintingsCount" type="java.lang.Integer" db-attribute-path="PAINTINGS_COUNT"/> </obj-entity> - <obj-entity name="BinaryPKTest1" className="org.objectstyle.art.BinaryPKTest1" dbEntityName="BINARY_PK_TEST1"> + <obj-entity name="BinaryPKTest1" className="org.apache.art.BinaryPKTest1" dbEntityName="BINARY_PK_TEST1"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="BinaryPKTest2" className="org.objectstyle.art.BinaryPKTest2" dbEntityName="BINARY_PK_TEST2"> + <obj-entity name="BinaryPKTest2" className="org.apache.art.BinaryPKTest2" dbEntityName="BINARY_PK_TEST2"> <obj-attribute name="detailName" type="java.lang.String" db-attribute-path="DETAIL_NAME"/> </obj-entity> - <obj-entity name="BitNumberTest" className="org.objectstyle.art.BitNumberTest" dbEntityName="BIT_TEST"> + <obj-entity name="BitNumberTest" className="org.apache.art.BitNumberTest" dbEntityName="BIT_TEST"> <obj-attribute name="bitColumn" type="java.lang.Integer" db-attribute-path="BIT_COLUMN"/> </obj-entity> - <obj-entity name="BitTest" className="org.objectstyle.art.BitTest" dbEntityName="BIT_TEST"> + <obj-entity name="BitTest" className="org.apache.art.BitTest" dbEntityName="BIT_TEST"> <obj-attribute name="bitColumn" type="java.lang.Boolean" db-attribute-path="BIT_COLUMN"/> </obj-entity> - <obj-entity name="BlobTest" className="org.objectstyle.art.BlobTest" dbEntityName="BLOB_TEST"> + <obj-entity name="BlobTest" className="org.apache.art.BlobTest" dbEntityName="BLOB_TEST"> <obj-attribute name="blobCol" type="byte[]" db-attribute-path="BLOB_COL"/> </obj-entity> - <obj-entity name="BooleanTest" className="org.objectstyle.art.BooleanTest" dbEntityName="BOOLEAN_TEST"> + <obj-entity name="BooleanTest" className="org.apache.art.BooleanTest" dbEntityName="BOOLEAN_TEST"> <obj-attribute name="booleanColumn" type="java.lang.Boolean" db-attribute-path="BOOLEAN_COLUMN"/> </obj-entity> - <obj-entity name="CharFkTest" className="org.objectstyle.art.CharFkTest" dbEntityName="CHAR_FK_TEST"> + <obj-entity name="CharFkTest" className="org.apache.art.CharFkTest" dbEntityName="CHAR_FK_TEST"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="CharPkTest" className="org.objectstyle.art.CharPkTest" dbEntityName="CHAR_PK_TEST"> + <obj-entity name="CharPkTest" className="org.apache.art.CharPkTest" dbEntityName="CHAR_PK_TEST"> <obj-attribute name="otherCol" type="java.lang.String" db-attribute-path="OTHER_COL"/> <obj-attribute name="pkCol" type="java.lang.String" db-attribute-path="PK_COL"/> </obj-entity> - <obj-entity name="ClobTest" className="org.objectstyle.art.ClobTest" dbEntityName="CLOB_TEST"> + <obj-entity name="ClobTest" className="org.apache.art.ClobTest" dbEntityName="CLOB_TEST"> <obj-attribute name="clobCol" type="java.lang.String" db-attribute-path="CLOB_COL"/> </obj-entity> - <obj-entity name="CompoundFkTest" className="org.objectstyle.art.CompoundFkTest" dbEntityName="COMPOUND_FK_TEST"> + <obj-entity name="CompoundFkTest" className="org.apache.art.CompoundFkTest" dbEntityName="COMPOUND_FK_TEST"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="CompoundPainting" className="org.objectstyle.art.CompoundPainting" readOnly="true" dbEntityName="PAINTING"> + <obj-entity name="CompoundPainting" className="org.apache.art.CompoundPainting" readOnly="true" dbEntityName="PAINTING"> <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="toArtist.ARTIST_NAME"/> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="galleryName" type="java.lang.String" db-attribute-path="toGallery.GALLERY_NAME"/> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> <obj-attribute name="textReview" type="java.lang.String" db-attribute-path="toPaintingInfo.TEXT_REVIEW"/> </obj-entity> - <obj-entity name="CompoundPkTest" className="org.objectstyle.art.CompoundPkTest" dbEntityName="COMPOUND_PK_TEST"> + <obj-entity name="CompoundPkTest" className="org.apache.art.CompoundPkTest" dbEntityName="COMPOUND_PK_TEST"> <obj-attribute name="key1" type="java.lang.String" db-attribute-path="KEY1"/> <obj-attribute name="key2" type="java.lang.String" db-attribute-path="KEY2"/> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="DateTest" className="org.objectstyle.art.DateTest" dbEntityName="DATE_TEST"> + <obj-entity name="DateTest" className="org.apache.art.DateTest" dbEntityName="DATE_TEST"> <obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/> <obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/> <obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/> </obj-entity> - <obj-entity name="DecimalPKTest" className="org.objectstyle.art.DecimalPKTest" dbEntityName="DECIMAL_PK_TST"> + <obj-entity name="DecimalPKTest" className="org.apache.art.DecimalPKTest" 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="DecimalPKTest1" className="org.objectstyle.art.DecimalPKTest1" dbEntityName="DECIMAL_PK_TST"> + <obj-entity name="DecimalPKTest1" className="org.apache.art.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="Exhibit" className="org.objectstyle.art.Exhibit" dbEntityName="EXHIBIT"> + <obj-entity name="Exhibit" className="org.apache.art.Exhibit" dbEntityName="EXHIBIT"> <obj-attribute name="closingDate" type="java.util.Date" db-attribute-path="CLOSING_DATE"/> <obj-attribute name="openingDate" type="java.util.Date" db-attribute-path="OPENING_DATE"/> </obj-entity> - <obj-entity name="Gallery" className="org.objectstyle.art.Gallery" dbEntityName="GALLERY"> + <obj-entity name="Gallery" className="org.apache.art.Gallery" dbEntityName="GALLERY"> <obj-attribute name="galleryName" type="java.lang.String" db-attribute-path="GALLERY_NAME"/> </obj-entity> - <obj-entity name="GeneratedColumnCompKey" className="org.objectstyle.art.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY"> + <obj-entity name="GeneratedColumnCompKey" className="org.apache.art.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="GeneratedColumnCompMaster" className="org.objectstyle.art.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M"> + <obj-entity name="GeneratedColumnCompMaster" className="org.apache.art.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="GeneratedColumnDep" className="org.objectstyle.art.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP"> + <obj-entity name="GeneratedColumnDep" className="org.apache.art.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="GeneratedColumnTest" className="org.objectstyle.art.GeneratedColumnTest" dbEntityName="GENERATED_COLUMN_TEST"> + <obj-entity name="GeneratedColumnTest" className="org.apache.art.GeneratedColumnTest" dbEntityName="GENERATED_COLUMN_TEST"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="GeneratedColumnTest2" className="org.objectstyle.art.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2"> + <obj-entity name="GeneratedColumnTest2" className="org.apache.art.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="MeaningfulGeneratedColumnTest" className="org.objectstyle.art.MeaningfulGeneratedColumnTest" dbEntityName="GENERATED_COLUMN_TEST"> + <obj-entity name="MeaningfulGeneratedColumnTest" className="org.apache.art.MeaningfulGeneratedColumnTest" dbEntityName="GENERATED_COLUMN_TEST"> <obj-attribute name="generatedColumn" type="java.lang.Integer" db-attribute-path="GENERATED_COLUMN"/> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="MeaningfulPKDep" className="org.objectstyle.art.MeaningfulPKDep" dbEntityName="MEANINGFUL_PK_DEP"> + <obj-entity name="MeaningfulPKDep" className="org.apache.art.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.objectstyle.art.MeaningfulPKTest1" dbEntityName="MEANINGFUL_PK_TEST1"> + <obj-entity name="MeaningfulPKTest1" className="org.apache.art.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="MixedPersistenceStrategy" className="org.objectstyle.art.MixedPersistenceStrategy" dbEntityName="MIXED_PERSISTENCE_STRATEGY"> + <obj-entity name="MixedPersistenceStrategy" className="org.apache.art.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.objectstyle.art.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2"> + <obj-entity name="MixedPersistenceStrategy2" className="org.apache.art.MixedPersistenceStrategy2" dbEntityName="MIXED_PERSISTENCE_STRATEGY2"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> - <obj-entity name="NoPkTest" className="org.objectstyle.art.NoPkTest" dbEntityName="NO_PK_TEST"> + <obj-entity name="NoPkTest" className="org.apache.art.NoPkTest" dbEntityName="NO_PK_TEST"> <obj-attribute name="attribute1" type="java.lang.Integer" db-attribute-path="ATTRIBUTE1"/> </obj-entity> - <obj-entity name="Painting" className="org.objectstyle.art.Painting" dbEntityName="PAINTING" superClassName="org.objectstyle.art.ArtDataObject"> + <obj-entity name="Painting" className="org.apache.art.Painting" dbEntityName="PAINTING" superClassName="org.apache.art.ArtDataObject"> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="paintingDescription" type="java.lang.String" db-attribute-path="PAINTING_DESCRIPTION"/> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> </obj-entity> - <obj-entity name="Painting1" className="org.objectstyle.art.Painting1" dbEntityName="PAINTING1"> + <obj-entity name="Painting1" className="org.apache.art.Painting1" dbEntityName="PAINTING1"> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> </obj-entity> - <obj-entity name="PaintingInfo" className="org.objectstyle.art.PaintingInfo" dbEntityName="PAINTING_INFO"> + <obj-entity name="PaintingInfo" className="org.apache.art.PaintingInfo" dbEntityName="PAINTING_INFO"> <obj-attribute name="imageBlob" type="byte[]" db-attribute-path="IMAGE_BLOB"/> <obj-attribute name="textReview" type="java.lang.String" db-attribute-path="TEXT_REVIEW"/> </obj-entity> - <obj-entity name="ROArtist" className="org.objectstyle.art.ROArtist" readOnly="true" dbEntityName="ARTIST"> + <obj-entity name="ROArtist" className="org.apache.art.ROArtist" readOnly="true" dbEntityName="ARTIST"> <obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/> <obj-attribute name="dateOfBirth" type="java.sql.Date" db-attribute-path="DATE_OF_BIRTH"/> </obj-entity> - <obj-entity name="ROPainting" className="org.objectstyle.art.ROPainting" readOnly="true" dbEntityName="PAINTING"> + <obj-entity name="ROPainting" className="org.apache.art.ROPainting" readOnly="true" dbEntityName="PAINTING"> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> </obj-entity> - <obj-entity name="RWCompoundPainting" className="org.objectstyle.art.RWCompoundPainting" dbEntityName="PAINTING"> + <obj-entity name="RWCompoundPainting" className="org.apache.art.RWCompoundPainting" dbEntityName="PAINTING"> <obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> <obj-attribute name="textReview" type="java.lang.String" db-attribute-path="toPaintingInfo.TEXT_REVIEW"/> </obj-entity> - <obj-entity name="SmallintTest" className="org.objectstyle.art.SmallintTest" dbEntityName="SMALLINT_TEST"> + <obj-entity name="SmallintTest" className="org.apache.art.SmallintTest" dbEntityName="SMALLINT_TEST"> <obj-attribute name="smallintCol" type="java.lang.Short" db-attribute-path="SMALLINT_COL"/> </obj-entity> - <obj-entity name="SubPainting" className="org.objectstyle.art.SubPainting" dbEntityName="PAINTING"> + <obj-entity name="SubPainting" className="org.apache.art.SubPainting" dbEntityName="PAINTING"> <obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/> </obj-entity> - <obj-entity name="TinyintTest" className="org.objectstyle.art.TinyintTest" dbEntityName="TINYINT_TEST"> + <obj-entity name="TinyintTest" className="org.apache.art.TinyintTest" dbEntityName="TINYINT_TEST"> <obj-attribute name="tinyintCol" type="java.lang.Byte" db-attribute-path="TINYINT_COL"/> </obj-entity> <db-relationship name="artistGroupArray" source="ARTGROUP" target="ARTIST_GROUP" toMany="true"> @@ -473,45 +473,45 @@ <obj-relationship name="painting" source="PaintingInfo" target="Painting" deleteRule="Nullify" db-relationship-path="painting"/> <obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/> <obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/> - <query name="NonSelectingQuery" factory="org.objectstyle.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap"> + <query name="NonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap"> <sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql> - <sql adapter-class="org.objectstyle.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql> + <sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (512, 'No Painting Like This', 12.5)]]></sql> </query> - <query name="ObjectQuery" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting"> + <query name="ObjectQuery" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Painting"> <property name="cayenne.GenericSelectQuery.refreshingObjects" value="false"/> <qualifier><![CDATA[toArtist = $artist]]></qualifier> <ordering><![CDATA[paintingTitle]]></ordering> </query> - <query name="ParameterizedNonSelectingQuery" factory="org.objectstyle.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap"> + <query name="ParameterizedNonSelectingQuery" factory="org.apache.cayenne.map.SQLTemplateBuilder" root="data-map" root-name="testmap"> <sql><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) VALUES (#bind($id), #bind($title), #bind($price))]]></sql> - <sql adapter-class="org.objectstyle.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql> + <sql adapter-class="org.apache.cayenne.dba.db2.DB2Adapter"><![CDATA[INSERT INTO PAINTING (PAINTING_ID, PAINTING_TITLE, ESTIMATED_PRICE) values (#bind($id), #bind($title), #bind($price))]]></sql> </query> - <query name="ParameterizedQueryWithLocalCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="ParameterizedQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <property name="cayenne.GenericSelectQuery.cachePolicy" value="localcache"/> <qualifier><![CDATA[artistName like $name]]></qualifier> </query> - <query name="ParameterizedQueryWithSharedCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="ParameterizedQueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <property name="cayenne.GenericSelectQuery.cachePolicy" value="sharedcache"/> <qualifier><![CDATA[artistName like $name]]></qualifier> </query> - <query name="ProcedureQuery" factory="org.objectstyle.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist"> + <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist"> </query> - <query name="QueryWithLocalCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <property name="cayenne.GenericSelectQuery.cachePolicy" value="localcache"/> </query> - <query name="QueryWithOrdering" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="QueryWithOrdering" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <ordering descending="true" ignore-case="true"><![CDATA[artistName]]></ordering> <ordering><![CDATA[dateOfBirth]]></ordering> </query> - <query name="QueryWithPrefetch" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery"> + <query name="QueryWithPrefetch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Gallery"> <prefetch>paintingArray</prefetch> </query> - <query name="QueryWithQualifier" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="QueryWithQualifier" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <qualifier><![CDATA[artistName = $param1]]></qualifier> </query> - <query name="QueryWithSharedCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> + <query name="QueryWithSharedCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist"> <property name="cayenne.GenericSelectQuery.cachePolicy" value="sharedcache"/> </query> </data-map>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testtemplate.vm URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testtemplate.vm?rev=422603&r1=422602&r2=422603&view=diff ============================================================================== --- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testtemplate.vm (original) +++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testtemplate.vm Sun Jul 16 19:35:13 2006 @@ -5,7 +5,7 @@ #end import java.util.List; -import org.objectstyle.cayenne.*; +import org.apache.cayenne.*; /** Class ${classGen.superPrefix}${classGen.className} was generated by Cayenne. * It is probably a good idea to avoid changing this class manually, Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/cayenne.xml URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/cayenne.xml?rev=422603&r1=422602&r2=422603&view=diff ============================================================================== --- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/cayenne.xml (original) +++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/cayenne.xml Sun Jul 16 19:35:13 2006 @@ -10,6 +10,20 @@ <map name="people" location="people.map.xml"/> <map name="relationships" location="relationships.map.xml"/> <map name="testmap" location="testmap.map.xml"/> + + <node name="defaultNode" + datasource="defaultNode.driver.xml" + factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory"> + <map-ref name="generic"/> + <map-ref name="one-way-map"/> + <map-ref name="map-db2"/> + <map-ref name="multi-tier"/> + <map-ref name="locking"/> + <map-ref name="map-db1"/> + <map-ref name="testmap"/> + <map-ref name="people"/> + <map-ref name="relationships"/> + </node> </domain> <view name="dataview0" location="dataview0.view.xml"/> <view name="dataview1" location="dataview1.view.xml"/> Added: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/defaultNode.driver.xml URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/defaultNode.driver.xml?rev=422603&view=auto ============================================================================== --- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/defaultNode.driver.xml (added) +++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/defaultNode.driver.xml Sun Jul 16 19:35:13 2006 @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<driver project-version="1.1"> + <connectionPool min="1" max="1" /> +</driver>
