db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r919728 - /db/torque/torque4/trunk/torque-test/pom.xml
Date Sat, 06 Mar 2010 09:52:45 GMT
Author: tfischer
Date: Sat Mar  6 09:52:45 2010
New Revision: 919728

URL: http://svn.apache.org/viewvc?rev=919728&view=rev
Log:
- now uses new mojo options  newFileTargetDirUsage 
- inserted idtable-init.sql generation
- set autocommit to true for sql execution

Modified:
    db/torque/torque4/trunk/torque-test/pom.xml

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=919728&r1=919727&r2=919728&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Sat Mar  6 09:52:45 2010
@@ -172,8 +172,25 @@
               <configPackage>org.apache.torque.templates.sql</configPackage>
               <sourceDir>target/torque/test/schema</sourceDir>
               <newFileTargetDir>target/generated-sql</newFileTargetDir>
-              <compileNewFileTargetDir>false</compileNewFileTargetDir>
-              <compileModifiedFileTargetDir>false</compileModifiedFileTargetDir>
+              <newFileTargetDirUsage>none</newFileTargetDirUsage>
+              <loglevel>info</loglevel>
+              <options>
+                <torque.database>${torque.targetDatabase}</torque.database>
+              </options>
+            </configuration>
+          </execution>
+          <execution>
+            <id>generate-idtable-sql</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <packaging>classpath</packaging>
+              <configPackage>org.apache.torque.templates.idtable</configPackage>
+              <sourceDir>target/torque/test/schema</sourceDir>
+              <newFileTargetDir>target/generated-sql</newFileTargetDir>
+              <newFileTargetDirUsage>none</newFileTargetDirUsage>
               <loglevel>info</loglevel>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
@@ -191,8 +208,7 @@
               <configPackage>org.apache.torque.templates.doc.html</configPackage>
               <sourceDir>target/torque/test/schema</sourceDir>
               <newFileTargetDir>target/generated-docs</newFileTargetDir>
-              <compileNewFileTargetDir>false</compileNewFileTargetDir>
-              <compileModifiedFileTargetDir>false</compileModifiedFileTargetDir>
+              <newFileTargetDirUsage>none</newFileTargetDirUsage>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
                 <torque.om.package>org.apache.torque.test</torque.om.package>
@@ -210,7 +226,7 @@
               <configPackage>org.apache.torque.templates.doc.xdoc</configPackage>
               <sourceDir>target/torque/test/schema</sourceDir>
               <newFileTargetDir>target/generated-xdocs</newFileTargetDir>
-              <compileNewFileTargetDir>false</compileNewFileTargetDir>
+              <newFileTargetDirUsage>none</newFileTargetDirUsage>
               <options>
                 <torque.database>${torque.targetDatabase}</torque.database>
                 <torque.om.package>org.apache.torque.test</torque.om.package>
@@ -233,7 +249,7 @@
         <version>1.4</version>
         <executions>
           <execution>
-            <id>execute-generated-sql</id>
+            <id>execute-ddl</id>
             <phase>process-classes</phase>
             <goals>
               <goal>execute</goal>
@@ -244,11 +260,40 @@
               <username>${torque.database.user}</username>
               <password>${torque.database.password}</password>
               <onError>continue</onError>
+              <autocommit>true</autocommit>
               <fileset>
                 <basedir>${basedir}/target/generated-sql</basedir>
                 <includes>
                   <include>*.sql</include>
                 </includes>
+                <excludes>
+                  <exclude>*idtable-init.sql</exclude>
+                </excludes>
+              </fileset>
+            </configuration>
+          </execution>
+          <execution>
+            <!-- 
+              separate execution to make sure the idtable is filled
+              after it is created
+            -->
+            <id>execute-idtable-sql</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <driver>${torque.driver}</driver>
+              <url>${torque.database.url}</url>
+              <username>${torque.database.user}</username>
+              <password>${torque.database.password}</password>
+              <onError>continue</onError>
+              <autocommit>true</autocommit>
+              <fileset>
+                <basedir>${basedir}/target/generated-sql</basedir>
+                <includes>
+                  <include>*idtable-init.sql</include>
+                </includes>
               </fileset>
             </configuration>
           </execution>



---------------------------------------------------------------------
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