[jbpm-commits] JBoss JBPM SVN: r4288 - in jbpm4/trunk: modules/db and 1 other directory.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-03-19 05:27:18 -0400 (Thu, 19 Mar 2009)
New Revision: 4288

Modified:
   jbpm4/trunk/modules/db/pom.xml
   jbpm4/trunk/pom.xml
Log:
Include DB in reactor run and re-introduce -Pcreate-tables

Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml	2009-03-19 09:22:49 UTC (rev 4287)
+++ jbpm4/trunk/modules/db/pom.xml	2009-03-19 09:27:18 UTC (rev 4288)
@@ -48,9 +48,9 @@
     <dependency>
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
-    </dependency>   
+    </dependency>
   </dependencies>
-  
+
   <profiles>
     <profile>
       <id>database</id>
@@ -77,21 +77,61 @@
                 </configuration>
               </execution>
             </executions>
+          </plugin>        
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>drop-tables</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>create-drop-tables</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <ant antfile="../distro/src/main/resources/config-tool/build.xml"
+                         target="db.drop"
+                         inheritall="false">
+                      <property name="database" value="${database}" />
+                      <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" />
+                      <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" />
+                      <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" />
+                      <property name="libs.dir" value="${basedir}/target/libs" />
+                    </ant>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
-          <!-- Execute config tool -->
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>create-tables</id>
+      <build>
+        <plugins>
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>drop.create.db</id>
-                <phase>process-resources</phase>
+                <id>create-drop-tables</id>
+                <phase>pre-integration-test</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
                   <tasks>
-                    <ant antfile="../distro/src/main/resources/config-tool/build.xml" 
-                         target="db.drop.create" 
+                    <ant antfile="../distro/src/main/resources/config-tool/build.xml"
+                         target="db.create"
                          inheritall="false">
                       <property name="database" value="${database}" />
                       <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" />
@@ -107,6 +147,7 @@
         </plugins>
       </build>
     </profile>
+
   </profiles>
 
 </project>
\ No newline at end of file

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-03-19 09:22:49 UTC (rev 4287)
+++ jbpm4/trunk/pom.xml	2009-03-19 09:27:18 UTC (rev 4288)
@@ -35,6 +35,7 @@
     <module>modules/test-base</module>
     <module>modules/pvm</module>
     <module>modules/jpdl</module>
+    <module>modules/db</module>
     <module>modules/examples</module>
     <module>modules/test-db</module>
     <module>modules/test-pojo</module>