Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6DE88D26A for ; Sun, 7 Oct 2012 07:31:26 +0000 (UTC) Received: (qmail 48767 invoked by uid 500); 7 Oct 2012 07:31:25 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 48675 invoked by uid 500); 7 Oct 2012 07:31:24 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 48647 invoked by uid 500); 7 Oct 2012 07:31:23 -0000 Received: (qmail 48640 invoked by uid 99); 7 Oct 2012 07:31:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 07:31:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 07:31:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 128A6238896F; Sun, 7 Oct 2012 07:30:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1395238 - in /db/torque/torque4/trunk/torque-test: ./ src/main/schema/ src/test/java/org/apache/torque/ src/test/java/org/apache/torque/adapter/ src/test/java/org/apache/torque/avalon/ src/test/java/org/apache/torque/datatypes/ src/test/ja... Date: Sun, 07 Oct 2012 07:30:26 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121007073029.128A6238896F@eris.apache.org> Author: tfischer Date: Sun Oct 7 07:30:25 2012 New Revision: 1395238 URL: http://svn.apache.org/viewvc?rev=1395238&view=rev Log: TORQUE-228 use different packages in test project to see whether imports work correctly Modified: db/torque/torque4/trunk/torque-test/pom.xml db/torque/torque4/trunk/torque-test/src/main/schema/databaseMapInit-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/adapter/AdapterTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyAdderTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GetRelatedObjectsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java db/torque/torque4/trunk/torque-test/torque-gen.properties Modified: db/torque/torque4/trunk/torque-test/pom.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/pom.xml (original) +++ db/torque/torque4/trunk/torque-test/pom.xml Sun Oct 7 07:30:25 2012 @@ -165,8 +165,6 @@ ${torque.useManagers} ${torque.generateBeans} - true - true Modified: db/torque/torque4/trunk/torque-test/src/main/schema/databaseMapInit-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/databaseMapInit-schema.xml?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/databaseMapInit-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/databaseMapInit-schema.xml Sun Oct 7 07:30:25 2012 @@ -20,12 +20,7 @@ + defaultIdMethod="@DATABASE_ID_METHOD@"> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml Sun Oct 7 07:30:25 2012 @@ -211,17 +211,16 @@ Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BaseDatabaseTestCase.java Sun Oct 7 07:30:25 2012 @@ -27,12 +27,11 @@ import junit.framework.TestCase; import org.apache.torque.adapter.Adapter; import org.apache.torque.adapter.MysqlAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.map.TableMap; import org.apache.torque.om.mapper.StringMapper; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; import org.apache.torque.util.BasePeer; import org.apache.torque.util.CountHelper; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/BeanTestConditional.java Sun Oct 7 07:30:25 2012 @@ -25,13 +25,13 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.List; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.criteria.Criteria; import org.apache.torque.test.bean.AuthorBean; import org.apache.torque.test.bean.BookBean; -import org.apache.torque.criteria.Criteria; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Test generated bean classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java Sun Oct 7 07:30:25 2012 @@ -39,42 +39,42 @@ import org.apache.torque.criteria.Criter import org.apache.torque.om.mapper.CompositeMapper; import org.apache.torque.om.mapper.IntegerMapper; import org.apache.torque.om.mapper.RecordMapper; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.AuthorRecordMapper; -import org.apache.torque.test.BlobTest; -import org.apache.torque.test.BlobTestPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; -import org.apache.torque.test.BookRecordMapper; -import org.apache.torque.test.ClobTest; -import org.apache.torque.test.ClobTestPeer; -import org.apache.torque.test.IfcTable; -import org.apache.torque.test.IfcTable2; -import org.apache.torque.test.IfcTable2Peer; -import org.apache.torque.test.IfcTablePeer; -import org.apache.torque.test.InheritanceChildB; -import org.apache.torque.test.InheritanceChildC; -import org.apache.torque.test.InheritanceChildD; -import org.apache.torque.test.InheritanceClassnameTest; import org.apache.torque.test.InheritanceClassnameTestChild1; import org.apache.torque.test.InheritanceClassnameTestChild2; -import org.apache.torque.test.InheritanceClassnameTestPeer; -import org.apache.torque.test.InheritanceTest; -import org.apache.torque.test.InheritanceTestPeer; -import org.apache.torque.test.IntegerPk; -import org.apache.torque.test.IntegerPkPeer; -import org.apache.torque.test.LargePk; -import org.apache.torque.test.LargePkPeer; -import org.apache.torque.test.LocalTestInterface; -import org.apache.torque.test.MultiPk; -import org.apache.torque.test.MultiPkForeignKey; -import org.apache.torque.test.MultiPkForeignKeyPeer; -import org.apache.torque.test.MultiPkPeer; -import org.apache.torque.test.Nopk; -import org.apache.torque.test.NopkPeer; -import org.apache.torque.test.NullValueTable; -import org.apache.torque.test.NullValueTablePeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.BlobTest; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.dbobject.ClobTest; +import org.apache.torque.test.dbobject.IfcTable; +import org.apache.torque.test.dbobject.IfcTable2; +import org.apache.torque.test.dbobject.InheritanceChildB; +import org.apache.torque.test.dbobject.InheritanceChildC; +import org.apache.torque.test.dbobject.InheritanceChildD; +import org.apache.torque.test.dbobject.InheritanceClassnameTest; +import org.apache.torque.test.dbobject.InheritanceTest; +import org.apache.torque.test.dbobject.IntegerPk; +import org.apache.torque.test.dbobject.LargePk; +import org.apache.torque.test.dbobject.LocalTestInterface; +import org.apache.torque.test.dbobject.MultiPk; +import org.apache.torque.test.dbobject.MultiPkForeignKey; +import org.apache.torque.test.dbobject.Nopk; +import org.apache.torque.test.dbobject.NullValueTable; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BlobTestPeer; +import org.apache.torque.test.peer.BookPeer; +import org.apache.torque.test.peer.ClobTestPeer; +import org.apache.torque.test.peer.IfcTable2Peer; +import org.apache.torque.test.peer.IfcTablePeer; +import org.apache.torque.test.peer.InheritanceClassnameTestPeer; +import org.apache.torque.test.peer.InheritanceTestPeer; +import org.apache.torque.test.peer.IntegerPkPeer; +import org.apache.torque.test.peer.LargePkPeer; +import org.apache.torque.test.peer.MultiPkForeignKeyPeer; +import org.apache.torque.test.peer.MultiPkPeer; +import org.apache.torque.test.peer.NopkPeer; +import org.apache.torque.test.peer.NullValueTablePeer; +import org.apache.torque.test.recordmapper.AuthorRecordMapper; +import org.apache.torque.test.recordmapper.BookRecordMapper; import org.apache.torque.util.BasePeer; import org.apache.torque.util.CountHelper; import org.apache.torque.util.Transaction; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java Sun Oct 7 07:30:25 2012 @@ -26,12 +26,11 @@ import org.apache.commons.logging.LogFac import org.apache.torque.adapter.Adapter; import org.apache.torque.adapter.MysqlAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.map.TableMap; import org.apache.torque.om.mapper.ObjectListMapper; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; import org.apache.torque.util.BasePeer; /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ForeignKeySchemaData.java Sun Oct 7 07:30:25 2012 @@ -23,28 +23,28 @@ import java.util.ArrayList; import java.util.List; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.CompIntegerVarcharFk; -import org.apache.torque.test.CompIntegerVarcharFkPeer; -import org.apache.torque.test.CompIntegerVarcharPk; -import org.apache.torque.test.CompIntegerVarcharPkPeer; -import org.apache.torque.test.CompNonpkFk; -import org.apache.torque.test.CompNonpkFkPeer; -import org.apache.torque.test.NonPkOIntegerFk; -import org.apache.torque.test.NonPkOIntegerFkPeer; -import org.apache.torque.test.NonPkPIntegerFk; -import org.apache.torque.test.NonPkPIntegerFkPeer; -import org.apache.torque.test.NullableOIntegerFk; -import org.apache.torque.test.NullableOIntegerFkPeer; -import org.apache.torque.test.NullablePIntegerFk; -import org.apache.torque.test.NullablePIntegerFkPeer; -import org.apache.torque.test.OIntegerPk; -import org.apache.torque.test.OIntegerPkPeer; -import org.apache.torque.test.PIntegerPk; -import org.apache.torque.test.PIntegerPkPeer; -import org.apache.torque.test.RequiredOIntegerFk; -import org.apache.torque.test.RequiredOIntegerFkPeer; -import org.apache.torque.test.RequiredPIntegerFk; -import org.apache.torque.test.RequiredPIntegerFkPeer; +import org.apache.torque.test.dbobject.CompIntegerVarcharFk; +import org.apache.torque.test.dbobject.CompIntegerVarcharPk; +import org.apache.torque.test.dbobject.CompNonpkFk; +import org.apache.torque.test.dbobject.NonPkOIntegerFk; +import org.apache.torque.test.dbobject.NonPkPIntegerFk; +import org.apache.torque.test.dbobject.NullableOIntegerFk; +import org.apache.torque.test.dbobject.NullablePIntegerFk; +import org.apache.torque.test.dbobject.OIntegerPk; +import org.apache.torque.test.dbobject.PIntegerPk; +import org.apache.torque.test.dbobject.RequiredOIntegerFk; +import org.apache.torque.test.dbobject.RequiredPIntegerFk; +import org.apache.torque.test.peer.CompIntegerVarcharFkPeer; +import org.apache.torque.test.peer.CompIntegerVarcharPkPeer; +import org.apache.torque.test.peer.CompNonpkFkPeer; +import org.apache.torque.test.peer.NonPkOIntegerFkPeer; +import org.apache.torque.test.peer.NonPkPIntegerFkPeer; +import org.apache.torque.test.peer.NullableOIntegerFkPeer; +import org.apache.torque.test.peer.NullablePIntegerFkPeer; +import org.apache.torque.test.peer.OIntegerPkPeer; +import org.apache.torque.test.peer.PIntegerPkPeer; +import org.apache.torque.test.peer.RequiredOIntegerFkPeer; +import org.apache.torque.test.peer.RequiredPIntegerFkPeer; /** * Contains data (i.e. table records) for the tables in the foreign key schema. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/InitShutdownTest.java Sun Oct 7 07:30:25 2012 @@ -24,16 +24,16 @@ import java.util.List; import junit.framework.TestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.NonPkOIntegerFkPeer; -import org.apache.torque.test.NonPkPIntegerFkPeer; -import org.apache.torque.test.NullableOIntegerFkPeer; -import org.apache.torque.test.NullablePIntegerFkPeer; -import org.apache.torque.test.OIntegerPk; -import org.apache.torque.test.OIntegerPkPeer; -import org.apache.torque.test.PIntegerPk; -import org.apache.torque.test.PIntegerPkPeer; -import org.apache.torque.test.RequiredOIntegerFkPeer; -import org.apache.torque.test.RequiredPIntegerFkPeer; +import org.apache.torque.test.dbobject.OIntegerPk; +import org.apache.torque.test.dbobject.PIntegerPk; +import org.apache.torque.test.peer.NonPkOIntegerFkPeer; +import org.apache.torque.test.peer.NonPkPIntegerFkPeer; +import org.apache.torque.test.peer.NullableOIntegerFkPeer; +import org.apache.torque.test.peer.NullablePIntegerFkPeer; +import org.apache.torque.test.peer.OIntegerPkPeer; +import org.apache.torque.test.peer.PIntegerPkPeer; +import org.apache.torque.test.peer.RequiredOIntegerFkPeer; +import org.apache.torque.test.peer.RequiredPIntegerFkPeer; /** * Tests initialisation and shutdown of Torque. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java Sun Oct 7 07:30:25 2012 @@ -42,7 +42,7 @@ import org.apache.torque.criteria.Criter import org.apache.torque.dsfactory.AbstractDataSourceFactory; import org.apache.torque.dsfactory.DataSourceFactory; import org.apache.torque.dsfactory.JndiDataSourceFactory; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.peer.BookPeer; /** * Test for configuration using JNDI. The test assumes that we have a Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/ManagerTestConditional.java Sun Oct 7 07:30:25 2012 @@ -19,9 +19,9 @@ package org.apache.torque; * under the License. */ -import org.apache.torque.test.Author; -import org.apache.torque.test.Book; -import org.apache.torque.test.IfcTable; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.dbobject.IfcTable; import org.apache.torque.test.manager.AuthorManager; import org.apache.torque.test.manager.BookManager; import org.apache.torque.test.manager.TestInterfaceManager; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/PkSchemaData.java Sun Oct 7 07:30:25 2012 @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Nopk; -import org.apache.torque.test.NopkPeer; +import org.apache.torque.test.dbobject.Nopk; +import org.apache.torque.test.peer.NopkPeer; /** * Contains data (i.e. table records) for the tables in the pk schema. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/adapter/AdapterTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/adapter/AdapterTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/adapter/AdapterTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/adapter/AdapterTest.java Sun Oct 7 07:30:25 2012 @@ -23,7 +23,7 @@ import java.sql.Connection; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.Torque; -import org.apache.torque.test.AuthorPeer; +import org.apache.torque.test.peer.AuthorPeer; import org.apache.torque.util.Transaction; /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java Sun Oct 7 07:30:25 2012 @@ -23,7 +23,7 @@ import org.apache.fulcrum.testcontainer. import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.map.DatabaseMap; -import org.apache.torque.test.AuthorPeer; +import org.apache.torque.test.peer.AuthorPeer; /** * Testing of the correct MapBuilder handling of the Torque Avalon Component Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java Sun Oct 7 07:30:25 2012 @@ -10,10 +10,10 @@ import org.apache.torque.adapter.DerbyAd import org.apache.torque.adapter.OracleAdapter; import org.apache.torque.criteria.Criteria; import org.apache.torque.om.StringKey; -import org.apache.torque.test.BitCompositePk; -import org.apache.torque.test.BitCompositePkPeer; -import org.apache.torque.test.BitValue; -import org.apache.torque.test.BitValuePeer; +import org.apache.torque.test.dbobject.BitCompositePk; +import org.apache.torque.test.dbobject.BitValue; +import org.apache.torque.test.peer.BitCompositePkPeer; +import org.apache.torque.test.peer.BitValuePeer; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BooleanIntCharTest.java Sun Oct 7 07:30:25 2012 @@ -9,8 +9,8 @@ import org.apache.torque.TorqueException import org.apache.torque.criteria.Criteria; import org.apache.torque.criteria.Criterion; import org.apache.torque.om.StringKey; -import org.apache.torque.test.BintBcharValue; -import org.apache.torque.test.BintBcharValuePeer; +import org.apache.torque.test.dbobject.BintBcharValue; +import org.apache.torque.test.peer.BintBcharValuePeer; import org.apache.torque.util.BasePeer; import org.apache.torque.util.ColumnValues; import org.apache.torque.util.JdbcTypedValue; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyAdderTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyAdderTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyAdderTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyAdderTest.java Sun Oct 7 07:30:25 2012 @@ -21,12 +21,12 @@ package org.apache.torque.generated.data import junit.framework.TestCase; -import org.apache.torque.test.NullableOIntegerFk; -import org.apache.torque.test.NullablePIntegerFk; -import org.apache.torque.test.OIntegerFkToPPk; -import org.apache.torque.test.OIntegerPk; -import org.apache.torque.test.PIntegerFkToOPk; -import org.apache.torque.test.PIntegerPk; +import org.apache.torque.test.dbobject.NullableOIntegerFk; +import org.apache.torque.test.dbobject.NullablePIntegerFk; +import org.apache.torque.test.dbobject.OIntegerFkToPPk; +import org.apache.torque.test.dbobject.OIntegerPk; +import org.apache.torque.test.dbobject.PIntegerFkToOPk; +import org.apache.torque.test.dbobject.PIntegerPk; /** * Tests the foreign key adder methods in the generated data object classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ForeignKeyGetterTest.java Sun Oct 7 07:30:25 2012 @@ -23,10 +23,10 @@ import junit.framework.TestCase; import org.apache.torque.om.NumberKey; import org.apache.torque.om.ObjectKey; -import org.apache.torque.test.NullableOIntegerFk; -import org.apache.torque.test.NullablePIntegerFk; -import org.apache.torque.test.OIntegerFkWithDefault; -import org.apache.torque.test.PIntegerFkWithDefault; +import org.apache.torque.test.dbobject.NullableOIntegerFk; +import org.apache.torque.test.dbobject.NullablePIntegerFk; +import org.apache.torque.test.dbobject.OIntegerFkWithDefault; +import org.apache.torque.test.dbobject.PIntegerFkWithDefault; /** * Tests the foreign key getter methods in the generated data object classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java Sun Oct 7 07:30:25 2012 @@ -27,13 +27,13 @@ import org.apache.torque.BaseDatabaseTes import org.apache.torque.TorqueException; import org.apache.torque.adapter.MssqlAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.IntegerObjectPk; -import org.apache.torque.test.IntegerObjectPkPeer; -import org.apache.torque.test.Nopk; -import org.apache.torque.test.NopkPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.dbobject.IntegerObjectPk; +import org.apache.torque.test.dbobject.Nopk; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.IntegerObjectPkPeer; +import org.apache.torque.test.peer.NopkPeer; import org.apache.torque.util.CountHelper; /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/ViewTest.java Sun Oct 7 07:30:25 2012 @@ -23,9 +23,9 @@ import java.util.List; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.BookAuthors; -import org.apache.torque.test.BookAuthorsPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.BookAuthors; +import org.apache.torque.test.peer.BookAuthorsPeer; /** * Tests whether the save methods work in the db object classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DateTest.java Sun Oct 7 07:30:25 2012 @@ -34,8 +34,8 @@ import org.apache.torque.adapter.MssqlAd import org.apache.torque.adapter.MysqlAdapter; import org.apache.torque.adapter.OracleAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.DateTimeTimestamp; -import org.apache.torque.test.DateTimeTimestampPeer; +import org.apache.torque.test.dbobject.DateTimeTimestamp; +import org.apache.torque.test.peer.DateTimeTimestampPeer; /** * Tests behavior of date, time and timestamp fields. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java Sun Oct 7 07:30:25 2012 @@ -23,14 +23,14 @@ import org.apache.torque.adapter.MysqlAd import org.apache.torque.adapter.OracleAdapter; import org.apache.torque.adapter.PostgresAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.CurrentDateTable; -import org.apache.torque.test.CurrentDateTablePeer; -import org.apache.torque.test.CurrentTimeTable; -import org.apache.torque.test.CurrentTimeTablePeer; -import org.apache.torque.test.CurrentTimestampTable; -import org.apache.torque.test.CurrentTimestampTablePeer; -import org.apache.torque.test.DatabaseDefaultValues; -import org.apache.torque.test.DatabaseDefaultValuesPeer; +import org.apache.torque.test.dbobject.CurrentDateTable; +import org.apache.torque.test.dbobject.CurrentTimeTable; +import org.apache.torque.test.dbobject.CurrentTimestampTable; +import org.apache.torque.test.dbobject.DatabaseDefaultValues; +import org.apache.torque.test.peer.CurrentDateTablePeer; +import org.apache.torque.test.peer.CurrentTimeTablePeer; +import org.apache.torque.test.peer.CurrentTimestampTablePeer; +import org.apache.torque.test.peer.DatabaseDefaultValuesPeer; import org.apache.torque.util.ColumnValues; import org.apache.torque.util.JdbcTypedValue; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java Sun Oct 7 07:30:25 2012 @@ -6,7 +6,7 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import org.apache.torque.BaseDatabaseTestCase; -import org.apache.torque.test.JavaDefaultValues; +import org.apache.torque.test.dbobject.JavaDefaultValues; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java Sun Oct 7 07:30:25 2012 @@ -32,12 +32,12 @@ import org.apache.torque.TorqueException import org.apache.torque.criteria.Criteria; import org.apache.torque.om.NumberKey; import org.apache.torque.om.ObjectKey; -import org.apache.torque.test.Nopk; -import org.apache.torque.test.NopkPeer; -import org.apache.torque.test.NullableOIntegerFk; -import org.apache.torque.test.NullableOIntegerFkPeer; -import org.apache.torque.test.OIntegerPk; -import org.apache.torque.test.OIntegerPkPeer; +import org.apache.torque.test.dbobject.Nopk; +import org.apache.torque.test.dbobject.NullableOIntegerFk; +import org.apache.torque.test.dbobject.OIntegerPk; +import org.apache.torque.test.peer.NopkPeer; +import org.apache.torque.test.peer.NullableOIntegerFkPeer; +import org.apache.torque.test.peer.OIntegerPkPeer; /** * Tests the delete methods in the generated Peer classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/FillerTest.java Sun Oct 7 07:30:25 2012 @@ -25,22 +25,22 @@ import org.apache.torque.BaseDatabaseTes import org.apache.torque.ForeignKeySchemaData; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.CompIntegerVarcharFk; -import org.apache.torque.test.CompIntegerVarcharFkPeer; -import org.apache.torque.test.CompIntegerVarcharPk; -import org.apache.torque.test.CompIntegerVarcharPkPeer; -import org.apache.torque.test.CompNonpkFk; -import org.apache.torque.test.CompNonpkFkPeer; -import org.apache.torque.test.NonPkOIntegerFk; -import org.apache.torque.test.NonPkOIntegerFkPeer; -import org.apache.torque.test.NullableOIntegerFk; -import org.apache.torque.test.NullableOIntegerFkPeer; -import org.apache.torque.test.OIntegerPk; -import org.apache.torque.test.OIntegerPkPeer; -import org.apache.torque.test.PIntegerPk; -import org.apache.torque.test.PIntegerPkPeer; -import org.apache.torque.test.RequiredPIntegerFk; -import org.apache.torque.test.RequiredPIntegerFkPeer; +import org.apache.torque.test.dbobject.CompIntegerVarcharFk; +import org.apache.torque.test.dbobject.CompIntegerVarcharPk; +import org.apache.torque.test.dbobject.CompNonpkFk; +import org.apache.torque.test.dbobject.NonPkOIntegerFk; +import org.apache.torque.test.dbobject.NullableOIntegerFk; +import org.apache.torque.test.dbobject.OIntegerPk; +import org.apache.torque.test.dbobject.PIntegerPk; +import org.apache.torque.test.dbobject.RequiredPIntegerFk; +import org.apache.torque.test.peer.CompIntegerVarcharFkPeer; +import org.apache.torque.test.peer.CompIntegerVarcharPkPeer; +import org.apache.torque.test.peer.CompNonpkFkPeer; +import org.apache.torque.test.peer.NonPkOIntegerFkPeer; +import org.apache.torque.test.peer.NullableOIntegerFkPeer; +import org.apache.torque.test.peer.OIntegerPkPeer; +import org.apache.torque.test.peer.PIntegerPkPeer; +import org.apache.torque.test.peer.RequiredPIntegerFkPeer; /** * Tests the filler methods in the generated Peer classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GetRelatedObjectsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GetRelatedObjectsTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GetRelatedObjectsTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/GetRelatedObjectsTest.java Sun Oct 7 07:30:25 2012 @@ -23,10 +23,10 @@ import java.util.List; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Tests whether the getRelatedObjects methodd works Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/ImplInitialisationTest.java Sun Oct 7 07:30:25 2012 @@ -20,9 +20,9 @@ package org.apache.torque.generated.peer */ import org.apache.torque.BaseDatabaseTestCase; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.AuthorPeerImpl; -import org.apache.torque.test.AuthorRecordMapper; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.AuthorPeerImpl; +import org.apache.torque.test.recordmapper.AuthorRecordMapper; /** * Tests the peerImpl initialisation. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java Sun Oct 7 07:30:25 2012 @@ -29,18 +29,18 @@ import org.apache.torque.TorqueException import org.apache.torque.adapter.HsqldbAdapter; import org.apache.torque.criteria.Criteria; import org.apache.torque.criteria.Criterion; -import org.apache.torque.test.A; -import org.apache.torque.test.APeer; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.B; -import org.apache.torque.test.BPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; -import org.apache.torque.test.C; -import org.apache.torque.test.CPeer; -import org.apache.torque.test.RAb; -import org.apache.torque.test.RAbPeer; +import org.apache.torque.test.dbobject.A; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.B; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.dbobject.C; +import org.apache.torque.test.dbobject.RAb; +import org.apache.torque.test.peer.APeer; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BPeer; +import org.apache.torque.test.peer.BookPeer; +import org.apache.torque.test.peer.CPeer; +import org.apache.torque.test.peer.RAbPeer; /** * Tests joins. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SaveMethodsInPeerTest.java Sun Oct 7 07:30:25 2012 @@ -23,12 +23,12 @@ import java.util.List; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.SaveMethodInObjectFk; -import org.apache.torque.test.SaveMethodInObjectFkPeer; -import org.apache.torque.test.SaveMethodInPeer; -import org.apache.torque.test.SaveMethodInPeerFk; -import org.apache.torque.test.SaveMethodInPeerFkPeer; -import org.apache.torque.test.SaveMethodInPeerPeer; +import org.apache.torque.test.dbobject.SaveMethodInObjectFk; +import org.apache.torque.test.dbobject.SaveMethodInPeer; +import org.apache.torque.test.dbobject.SaveMethodInPeerFk; +import org.apache.torque.test.peer.SaveMethodInObjectFkPeer; +import org.apache.torque.test.peer.SaveMethodInPeerFkPeer; +import org.apache.torque.test.peer.SaveMethodInPeerPeer; import org.apache.torque.util.CountHelper; /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectFunctionTest.java Sun Oct 7 07:30:25 2012 @@ -22,8 +22,8 @@ package org.apache.torque.generated.peer import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; import org.apache.torque.om.mapper.IntegerMapper; -import org.apache.torque.test.Summarize1; -import org.apache.torque.test.Summarize1Peer; +import org.apache.torque.test.dbobject.Summarize1; +import org.apache.torque.test.peer.Summarize1Peer; import org.apache.torque.util.BasePeerImpl; import org.apache.torque.util.functions.Avg; import org.apache.torque.util.functions.Count; Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectInTest.java Sun Oct 7 07:30:25 2012 @@ -24,10 +24,10 @@ import java.util.List; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Tests selects using the IN operator. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectTest.java Sun Oct 7 07:30:25 2012 @@ -26,10 +26,10 @@ import org.apache.torque.BaseDatabaseTes import org.apache.torque.TooManyRowsException; import org.apache.torque.Torque; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Tests simple selects. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java Sun Oct 7 07:30:25 2012 @@ -29,10 +29,10 @@ import org.apache.torque.ColumnImpl; import org.apache.torque.TorqueException; import org.apache.torque.adapter.MysqlAdapter; import org.apache.torque.criteria.Criteria; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Tests subselects in the where clause. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/map/DatabaseMapTest.java Sun Oct 7 07:30:25 2012 @@ -42,6 +42,8 @@ public class DatabaseMapTest extends Bas public static final String TABLE_NAME2 = "SECOND_MAP_INIT_TABLE"; + public static final String PROTECTED_TABLE = "PROTECTED_COLUMNS"; + public static final String[] COLUMN_NAMES = { "id", "one", "two", "three" @@ -214,8 +216,8 @@ public class DatabaseMapTest extends Bas if ( column == null ) { column = table.getColumn("ONE"); } - assertTrue( - "Column isProtected attribute returned false instead of true!", + assertFalse( + "Column isProtected attribute returned true instead of false!", column.isProtected()); assertTrue("Column size != 50", column.getSize() == 50); validateAttribute("Column default", "unknown", column @@ -228,6 +230,16 @@ public class DatabaseMapTest extends Bas } assertTrue("Column position attribute != 4", column.getPosition() == 4); + + TableMap tableWithProtectedColumn = map.getTable(PROTECTED_TABLE); + column = tableWithProtectedColumn.getColumn("id"); + assertTrue( + "Column isProtected attribute returned false instead of true!", + column.isProtected()); + column = tableWithProtectedColumn.getColumn("name"); + assertTrue( + "Column isProtected attribute returned false instead of true!", + column.isProtected()); } /** @@ -278,7 +290,8 @@ public class DatabaseMapTest extends Bas validateAttribute("Inheritance className", "MapInheritanceChildC", inh .getClassName()); validateAttribute("Inheritance extends", - "org.apache.torque.test.NotUsedBeforeMapInit", inh.getExtends()); + "org.apache.torque.test.dbobject.NotUsedBeforeMapInit", + inh.getExtends()); } /** @@ -313,7 +326,7 @@ public class DatabaseMapTest extends Bas "databaseOptionValue2", databaseMap.getOption("databaseOptionKey2")); - TableMap tableMap = databaseMap.getTable("OPTION"); + TableMap tableMap = databaseMap.getTable("OPTION_TABLE"); assertEquals(2, tableMap.getOptions().size()); assertEquals( "tableOptionValue1", Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java Sun Oct 7 07:30:25 2012 @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.Torque; -import org.apache.torque.test.AuthorPeer; +import org.apache.torque.test.peer.AuthorPeer; import org.apache.torque.util.Transaction; /** Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/om/OMByNameMethodsTest.java Sun Oct 7 07:30:25 2012 @@ -25,10 +25,10 @@ import java.util.Date; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.Column; import org.apache.torque.TorqueException; -import org.apache.torque.test.TypesObject; -import org.apache.torque.test.TypesObjectPeer; -import org.apache.torque.test.TypesPrimitive; -import org.apache.torque.test.TypesPrimitivePeer; +import org.apache.torque.test.dbobject.TypesObject; +import org.apache.torque.test.dbobject.TypesPrimitive; +import org.apache.torque.test.peer.TypesObjectPeer; +import org.apache.torque.test.peer.TypesPrimitivePeer; /** * Test the various setBy and getBy methods that can be used to access field Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild1.java Sun Oct 7 07:30:25 2012 @@ -20,6 +20,7 @@ package org.apache.torque.test; */ import org.apache.torque.om.Persistent; +import org.apache.torque.test.dbobject.InheritanceClassnameTest; /** * Child class of InheritanceClassnameTest to test inheritance Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/test/InheritanceClassnameTestChild2.java Sun Oct 7 07:30:25 2012 @@ -21,6 +21,7 @@ package org.apache.torque.test; */ import org.apache.torque.om.Persistent; +import org.apache.torque.test.dbobject.InheritanceClassnameTest; /** * Child class of InheritanceClassnameTest to test inheritance Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/BasePeerTest.java Sun Oct 7 07:30:25 2012 @@ -20,9 +20,8 @@ package org.apache.torque.util; */ import org.apache.torque.BaseDatabaseTestCase; -import org.apache.torque.util.Criteria; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.BookPeer; +import org.apache.torque.test.peer.AuthorPeer; +import org.apache.torque.test.peer.BookPeer; /** * Tests the methods in BasePeer directly, without any generated classes. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/CopyTestConditional.java Sun Oct 7 07:30:25 2012 @@ -20,9 +20,9 @@ package org.apache.torque.util; */ import org.apache.torque.BaseDatabaseTestCase; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; -import org.apache.torque.test.Book; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.dbobject.Book; +import org.apache.torque.test.peer.AuthorPeer; /** * Test code for TorqueObject.copy(). Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/LargeSelectTest.java Sun Oct 7 07:30:25 2012 @@ -21,13 +21,12 @@ package org.apache.torque.util; import java.util.List; -import org.apache.commons.lang.SerializationUtils; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.TorqueException; import org.apache.torque.criteria.Criteria; import org.apache.torque.om.mapper.IntegerMapper; -import org.apache.torque.test.Author; -import org.apache.torque.test.AuthorPeer; +import org.apache.torque.test.dbobject.Author; +import org.apache.torque.test.peer.AuthorPeer; /** * Test code for LargeSelect. Modified: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java (original) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java Sun Oct 7 07:30:25 2012 @@ -27,9 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.torque.BaseDatabaseTestCase; import org.apache.torque.criteria.Criteria; -import org.apache.torque.criteria.SqlEnum; -import org.apache.torque.test.Summarize1; -import org.apache.torque.test.Summarize1Peer; +import org.apache.torque.test.dbobject.Summarize1; +import org.apache.torque.test.peer.Summarize1Peer; import org.apache.torque.util.functions.Avg; import org.apache.torque.util.functions.Count; import org.apache.torque.util.functions.Max; Modified: db/torque/torque4/trunk/torque-test/torque-gen.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/torque-gen.properties?rev=1395238&r1=1395237&r2=1395238&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/torque-gen.properties (original) +++ db/torque/torque4/trunk/torque-test/torque-gen.properties Sun Oct 7 07:30:25 2012 @@ -20,4 +20,30 @@ # # $Id: Torque.properties 473825 2006-11-11 22:44:23Z tv $ # -torque.om.package=org.apache.torque.test \ No newline at end of file +torque.om.package=org.apache.torque.test + +torque.om.complexObjectModel.generateFillers=true +torque.om.generateMapInit=true + +# package suffix for the data object classes +torque.om.package.dbObjectPackageSuffix = .dbobject +# package suffix for the base data object classes +torque.om.package.baseDbObjectPackageSuffix = .dbobject.base +# package suffix for the peer classes +torque.om.package.peerPackageSuffix = .peer +# package suffix for the base peer classes +torque.om.package.basePeerPackageSuffix = .peer.base +# package suffix for the record mapper classes +torque.om.package.recordMapperPackageSuffix = .recordmapper +# package suffix for the base record mapper classes +torque.om.package.baseRecordMapperPackageSuffix = .recordmapper.base +# package suffix for the manager classes +torque.om.package.managerPackageSuffix = .manager +# package suffix for the base manager classes +torque.om.package.baseManagerPackageSuffix = .manager.base +# package suffix for the bean classes +torque.om.package.beanPackageSuffix = .bean +# package suffix for the base bean classes +torque.om.package.baseBeanPackageSuffix = .bean +# package suffix for the map init classes +torque.om.package.mapInitPackageSuffix = .mapinit --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org