db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r931347 - in /db/torque/torque4/trunk: torque-site/src/site/xdoc/developer-info/test-project.xml torque-test/pom.xml torque-test/profiles.xml
Date Tue, 06 Apr 2010 22:02:35 GMT
Author: tfischer
Date: Tue Apr  6 22:02:34 2010
New Revision: 931347

URL: http://svn.apache.org/viewvc?rev=931347&view=rev
Log:
- exclude external schema from generation in test project
- fixed beans and managers profiles and added documentation for them

Modified:
    db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml
    db/torque/torque4/trunk/torque-test/pom.xml
    db/torque/torque4/trunk/torque-test/profiles.xml

Modified: db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml?rev=931347&r1=931346&r2=931347&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml (original)
+++ db/torque/torque4/trunk/torque-site/src/site/xdoc/developer-info/test-project.xml Tue
Apr  6 22:02:34 2010
@@ -65,14 +65,26 @@
           </li>
           <li>
             In the directory <i>torque-test</i>, 
-            run the command <code>mvn -P${profile} test</code>
+            run the command <code>mvn -P${profile} clean test</code>
             to run the test, replacing the variable 
-            <code>${profile}</code> with the name of your chosen profile.
+            <code>${profile}</code> with the name of your chosen database
+            profile.<br/>
             For example, if you want to test against mysql, run
-            <code>mvn -Pmysql test</code>
+            <code>mvn -Pmysql clean test</code>.
           </li>
         </ul>
       </p>
+      <p>
+        The standard database profiles do not generate managers and beans,
+        nor do they execute the corresponding tests. For generating beans,
+        activate the beans profile. This will generate the bean classes 
+        and run the corresponding test. For using manager classes, activate
+        the managers profile. This will generate the manager classes 
+        and run the corresponding test.<br/>
+        For example, if you want to run the test against mysql and use beans
+        and managers, run
+        <code>mvn -Pmysql,beans,managers clean test</code>.
+      </p>
     </section>
     <section name="Running mvn eclipse:eclipse on the test project">
       <p>

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=931347&r1=931346&r2=931347&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Tue Apr  6 22:02:34 2010
@@ -116,11 +116,7 @@
               <tasks>                
                 <!-- schema files need to be copied to insert idMethod -->
                 <copy todir="target/torque/test/schema">
-                  <fileset dir="src/main/schema">
-                    <include name="*" />
-                    <!-- TODO: remove exclude once external schemata are implemented -->
-                    <exclude name="ext*schema.xml" />
-                  </fileset>
+                  <fileset dir="src/main/schema" />
                   <filterset>
                     <filter token="DATABASE_DEFAULT" value="bookstore"/>
                     <filter token="DATABASE_ID_METHOD" value="${torque.test.idmethod}"/>

@@ -155,9 +151,15 @@
               <configPackage>org.apache.torque.templates.om</configPackage>
               <sourceDir>target/torque/test/schema</sourceDir>
               <overrideConfigDir>src/main/torque-gf</overrideConfigDir>
+              <sourceExcludes>
+                <sourceExclude>ext*-schema.xml</sourceExclude>
+                <sourceExclude>id-table-schema.xml</sourceExclude>
+              </sourceExcludes>
               <options>
                 <torque.om.package>org.apache.torque.test</torque.om.package>
                 <torque.database>${torque.targetDatabase}</torque.database>
+                <torque.om.useManagers>${torque.useManagers}</torque.om.useManagers>
+                <torque.om.generateBeans>${torque.generateBeans}</torque.om.generateBeans>
               </options>
             </configuration>
           </execution>
@@ -174,6 +176,10 @@
               <newFileTargetDir>target/generated-sql</newFileTargetDir>
               <newFileTargetDirUsage>none</newFileTargetDirUsage>
               <loglevel>info</loglevel>
+              <sourceExcludes>
+                <sourceExclude>ext*-schema.xml</sourceExclude>
+                <sourceExclude>id-table-schema.xml</sourceExclude>
+              </sourceExcludes>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
               </options>

Modified: db/torque/torque4/trunk/torque-test/profiles.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/profiles.xml?rev=931347&r1=931346&r2=931347&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/profiles.xml (original)
+++ db/torque/torque4/trunk/torque-test/profiles.xml Tue Apr  6 22:02:34 2010
@@ -125,7 +125,6 @@
         <torque.test.driver.artifactId>mysql-connector-java</torque.test.driver.artifactId>
         <torque.test.driver.groupId>mysql</torque.test.driver.groupId>
         <torque.test.driver.version>5.0.4</torque.test.driver.version>
-        <torque.generateBeans>true</torque.generateBeans>
         <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
         <torque.targetDatabase>mysql</torque.targetDatabase>
         <torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
@@ -145,7 +144,6 @@
         <torque.test.driver.artifactId>jtds</torque.test.driver.artifactId>
         <torque.test.driver.groupId>net.sourceforge.jtds</torque.test.driver.groupId>
         <torque.test.driver.version>1.2.4</torque.test.driver.version>
-        <torque.generateBeans>true</torque.generateBeans>
         <torque.driver>net.sourceforge.jtds.jdbc.Driver</torque.driver>
         <torque.targetDatabase>mssql</torque.targetDatabase>
         <torque.database.url>jdbc:jtds:sqlserver://localhost:1433/torque</torque.database.url>



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


Mime
View raw message