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

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-08-29 13:31:40 -0400 (Sat, 29 Aug 2009)
New Revision: 5588

Modified:
   jbpm4/trunk/modules/examples/pom.xml
   jbpm4/trunk/modules/test-db/pom.xml
Log:
fixing the cleanup: synced test-db pom with examples for direct database testsuite execution

Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml	2009-08-29 14:39:48 UTC (rev 5587)
+++ jbpm4/trunk/modules/examples/pom.xml	2009-08-29 17:31:40 UTC (rev 5588)
@@ -68,7 +68,6 @@
     </dependency>
   </dependencies>
   
-
   <build>
     <plugins>
       <plugin>
@@ -94,32 +93,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>config</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>custom-config</id>
-                <phase>test-compile</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
-                      <property name="database" value="oracle" />
-                    </ant>
-                  </tasks>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>         
-        </plugins>
-      </build>
-    </profile>
 
     <!-- -Ddatabase= -->
     <profile>
@@ -175,6 +148,7 @@
           <name>jboss.bind.address</name>
         </property>
       </activation>
+
       <dependencies>
         <dependency>
           <groupId>org.jbpm.jbpm4</groupId>
@@ -194,6 +168,7 @@
           <scope>test</scope>
         </dependency>
       </dependencies>
+
       <build>
         <plugins>
           <plugin>

Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml	2009-08-29 14:39:48 UTC (rev 5587)
+++ jbpm4/trunk/modules/test-db/pom.xml	2009-08-29 17:31:40 UTC (rev 5588)
@@ -63,25 +63,25 @@
   
   <build>
     <plugins>
-			<!--  this create jar file of code from src/test/java so modules with tests can share code -->
-			<plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-jar-plugin</artifactId>
-				<executions>
-				  <execution>
-				    <goals>
-				       <goal>test-jar</goal>
-				    </goals>
-				    <configuration>
-				      <excludes>
-				        <exclude>jbpm.*</exclude>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-test-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <excludes>
+                <exclude>jbpm.*</exclude>
                 <exclude>logging.properties</exclude>
                 <exclude>META-INF/*</exclude>
-				      </excludes>
-				    </configuration>
-				  </execution>
-				</executions>
-			</plugin>    
+              </excludes> 
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -89,7 +89,7 @@
 
     <!-- -Ddatabase= -->
     <profile>
-      <id>standalone.tests</id>
+      <id>run.database.testsuite</id>
       <activation>
         <property>
           <name>database</name>
@@ -108,25 +108,22 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <copy file="../../qa/jdbc/${database}.properties" 
-                          tofile="target/test-classes/jdbc.properties"
-                          overwrite="true" />
-                    <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" 
-                          tofile="target/test-classes/jdbc.properties"
-                          overwrite="true"
-                          failonerror="false"/>
-                    <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml" 
-                          tofile="target/test-classes/jbpm.hibernate.cfg.xml" 
-                          overwrite="true">
-                      <filterset>
-                        <filtersfile file="target/test-classes/jdbc.properties" />
-                      </filterset>
+                    <echo message="database: ${database}" />
+                    <mkdir dir="target/jdbc.properties" />
+                    <copy todir="target/jdbc.properties" overwrite="true">
+                      <fileset dir="../../qa/jdbc" />
                     </copy>
-                    <!-- replace file="target/test-classes/jbpm.hibernate.cfg.xml">
-                      <replacetoken><![CDATA[<property name="hibernate.format_sql">true</property>]]></replacetoken>
-                      <replacevalue><![CDATA[<property name="hibernate.format_sql">true</property>
-    <property name="hibernate.hbm2ddl.auto">create-drop</property>]]></replacevalue>
-                    </replace -->
+                    <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
+                      <fileset dir="${user.home}/.jbpm4/jdbc" />
+                    </copy>
+                    <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
+                      <property name="tx" value="standalone.testsuite" />
+                      <property name="mail.cfg" value="testsuite" />
+                      <property name="database" value="${database}" />
+                      <property name="cfg.dest.dir" value="target/test-classes" />
+                      <property name="install.src.dir" value="../distro/src/main/files/install/src" />
+                      <property name="jdbc.properties.dir" value="target/jdbc.properties" />
+                    </ant> 
                   </tasks>
                 </configuration>
               </execution>
@@ -176,10 +173,8 @@
         </dependency>
       </dependencies>
 
-
       <build>
         <plugins>
-
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
@@ -202,7 +197,6 @@
               </execution>
             </executions>
           </plugin>
-
         </plugins>
       </build>
     </profile>