Author: tfischer
Date: Sun Dec 21 09:21:38 2008
New Revision: 728461

URL: http://svn.apache.org/viewvc?rev=728461&view=rev
Log:
moved into a maven 2 structure

Added:
    db/torque/torque4/trunk/torque-test/pom.xml   (contents, props changed)
      - copied, changed from r692871, db/torque/torque4/trunk/torque-test/test-project/pom.xml
    db/torque/torque4/trunk/torque-test/profiles.xml   (props changed)
      - copied unchanged from r692871, db/torque/torque4/trunk/torque-test/test-project/profiles.xml
    db/torque/torque4/trunk/torque-test/src/   (props changed)
      - copied from r692871, db/torque/torque4/trunk/torque-test/test-project/src/
    db/torque/torque4/trunk/torque-test/src/main/schema/   (props changed)
      - copied from r692871, db/torque/torque4/trunk/torque-test/test-project/src/schema/
    db/torque/torque4/trunk/torque-test/src/test/java/   (props changed)
      - copied from r692871, db/torque/torque4/trunk/torque-test/test-project/src/java/
    db/torque/torque4/trunk/torque-test/src/test/profile/   (props changed)
      - copied from r692871, db/torque/torque4/trunk/torque-test/profile/
    db/torque/torque4/trunk/torque-test/src/test/resources/
    db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml   (contents, props changed)
      - copied, changed from r692871, db/torque/torque4/trunk/torque-test/test-project/src/test/TestComponentConfig.xml
    db/torque/torque4/trunk/torque-test/src/test/resources/TestRoleConfig.xml   (props changed)
      - copied unchanged from r692871, db/torque/torque4/trunk/torque-test/test-project/src/test/TestRoleConfig.xml
    db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties   (props changed)
      - copied unchanged from r692871, db/torque/torque4/trunk/torque-test/test-project/src/test/TurbineResources.properties
    db/torque/torque4/trunk/torque-test/src/test/resources/cache.ccf   (props changed)
      - copied unchanged from r692871, db/torque/torque4/trunk/torque-test/test-project/src/java/cache.ccf
    db/torque/torque4/trunk/torque-test/src/test/resources/commons-logging.properties   (props changed)
      - copied unchanged from r692871, db/torque/torque4/trunk/torque-test/test-project/src/logging/commons-logging.properties
    db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties   (contents, props changed)
      - copied, changed from r692871, db/torque/torque4/trunk/torque-test/test-project/src/logging/log4j.properties
    db/torque/torque4/trunk/torque-test/src/test/sql/   (props changed)
      - copied from r692871, db/torque/torque4/trunk/torque-test/test-project/src/sql/
Removed:
    db/torque/torque4/trunk/torque-test/profile/
    db/torque/torque4/trunk/torque-test/src/java/
    db/torque/torque4/trunk/torque-test/src/logging/
    db/torque/torque4/trunk/torque-test/src/schema/
    db/torque/torque4/trunk/torque-test/src/sql/
    db/torque/torque4/trunk/torque-test/src/test/TestComponentConfig.xml
    db/torque/torque4/trunk/torque-test/src/test/TestRoleConfig.xml
    db/torque/torque4/trunk/torque-test/src/test/TurbineResources.properties
    db/torque/torque4/trunk/torque-test/src/test/java/cache.ccf
    db/torque/torque4/trunk/torque-test/src/test/profile/axion/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/axion/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/db2400/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/db2400/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/derby/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/derby/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyNetwork/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/derbyNetwork/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/firebird/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/firebird/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/henning/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/henning/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/hsqldb/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/jmcnally/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/mssql/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/mssql/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/oracle/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/oracle/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/postgresql/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/sybase/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/sybase/project.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/tv/project.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/tv/project.xml
    db/torque/torque4/trunk/torque-test/test-project/
Modified:
    db/torque/torque4/trunk/torque-test/   (props changed)
    db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/avalon/AvalonMapBuildersTest.java
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties

Propchange: db/torque/torque4/trunk/torque-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 21 09:21:38 2008
@@ -1 +1,4 @@
 .project
+target
+.settings
+.classpath

Copied: db/torque/torque4/trunk/torque-test/pom.xml (from r692871, db/torque/torque4/trunk/torque-test/test-project/pom.xml)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?p2=db/torque/torque4/trunk/torque-test/pom.xml&p1=db/torque/torque4/trunk/torque-test/test-project/pom.xml&r1=692871&r2=728461&rev=728461&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/test-project/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Sun Dec 21 09:21:38 2008
@@ -24,8 +24,8 @@
   <parent>
     <groupId>org.apache.torque</groupId>
     <artifactId>torque-maven-parent</artifactId>
-    <version>4.0-alpha-1-SNAPSHOT</version>
-    <relativePath>../maven-parent/pom.xml</relativePath>
+    <version>4.0-alpha1-SNAPSHOT</version>
+    <relativePath>../torque-maven-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -96,15 +96,6 @@
   </dependencies>
 
   <build>
-    <testSourceDirectory>src/java</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/java</directory>
-        <includes>
-          <include>*.ccf</include>
-        </includes>
-      </testResource>
-    </testResources>
     <plugins>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -113,8 +104,9 @@
             <phase>generate-sources</phase>
             <configuration>
               <tasks>
+                <!-- schema files need to be copied to insert idMethod -->
                 <copy todir="target/torque/test/schema">
-                  <fileset dir="src/schema">
+                  <fileset dir="src/main/schema">
                     <include name="*" />
                   </fileset>
                   <filterset>
@@ -124,7 +116,7 @@
                 </copy>
                 <delete dir="target/torque/test/sql" />
                 <copy todir="target/torque/test/sql">
-                  <fileset dir="src/sql" />
+                  <fileset dir="src/test/sql" />
                 </copy>
               </tasks>
             </configuration>
@@ -204,7 +196,7 @@
           <systemProperties>
             <property>
               <name>torque.configuration.file</name>
-              <value>../profile/${torque.test.profileDirectory}/Torque.properties</value>
+              <value>src/test/profile/${torque.test.profileDirectory}/Torque.properties</value>
             </property>
           </systemProperties>
         </configuration>

Propchange: db/torque/torque4/trunk/torque-test/pom.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/profiles.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/main/schema/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/java/
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=728461&r1=692871&r2=728461&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 Dec 21 09:21:38 2008
@@ -19,6 +19,7 @@
  */
 
 import org.apache.avalon.framework.component.ComponentException;
+import org.apache.commons.digester.SetTopRule;
 import org.apache.fulcrum.testcontainer.BaseUnitTest;
 import org.apache.torque.TorqueException;
 import org.apache.torque.map.DatabaseMap;
@@ -54,6 +55,8 @@
     public void setUp() throws Exception
     {
         super.setUp();
+        setConfigurationFileName("src/test/resources/TestComponentConfig.xml");
+        setRoleFileName("src/test/resources/TestRoleConfig.xml");
         try
         {
             torque = (Torque) this.resolve(Torque.ROLE);

Propchange: db/torque/torque4/trunk/torque-test/src/test/profile/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=728461&r1=692871&r2=728461&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties Sun Dec 21 09:21:38 2008
@@ -32,3 +32,6 @@
 torque.dsfactory.bookstore.connection.password = 
 
 torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
+
+# use Caching. This property is only used if managers are used by generators.
+torque.manager.useCache = true
\ No newline at end of file

Copied: db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml (from r692871, db/torque/torque4/trunk/torque-test/test-project/src/test/TestComponentConfig.xml)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml?p2=db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml&p1=db/torque/torque4/trunk/torque-test/test-project/src/test/TestComponentConfig.xml&r1=692871&r2=728461&rev=728461&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/test-project/src/test/TestComponentConfig.xml (original)
+++ db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml Sun Dec 21 09:21:38 2008
@@ -18,6 +18,6 @@
 -->
 <componentConfig>
     <TorqueComponent>
-        <configfile>/src/test/TurbineResources.properties</configfile>
+        <configfile>/src/test/resources/TurbineResources.properties</configfile>
     </TorqueComponent>
 </componentConfig>

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/TestComponentConfig.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/TestRoleConfig.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/TurbineResources.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/cache.ccf
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties (from r692871, db/torque/torque4/trunk/torque-test/test-project/src/logging/log4j.properties)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties?p2=db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties&p1=db/torque/torque4/trunk/torque-test/test-project/src/logging/log4j.properties&r1=692871&r2=728461&rev=728461&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/test-project/src/logging/log4j.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties Sun Dec 21 09:21:38 2008
@@ -32,7 +32,7 @@
 log4j.additivity.org.apache.jcs = false
 
 log4j.appender.torque = org.apache.log4j.FileAppender
-log4j.appender.torque.file = target/logs/base-test.log
+log4j.appender.torque.file = target/test.log
 log4j.appender.torque.append = true
 log4j.appender.torque.layout = org.apache.log4j.PatternLayout
 log4j.appender.torque.layout.conversionPattern = %d [%t] %-5p %c - %m%n

Propchange: db/torque/torque4/trunk/torque-test/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: db/torque/torque4/trunk/torque-test/src/test/sql/
------------------------------------------------------------------------------
    svn:mergeinfo = 



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org