[jbpm-commits] JBoss JBPM SVN: r5496 - in jbpm4/trunk: modules/api and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Aug 20 03:04:52 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-08-20 03:04:51 -0400 (Thu, 20 Aug 2009)
New Revision: 5496

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties
   jbpm4/trunk/qa/cfg/
   jbpm4/trunk/qa/cfg/testsuite.db/
   jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
   jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
   jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
   jbpm4/trunk/qa/hudson-jbpm4-db.bat
Removed:
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties
Modified:
   jbpm4/trunk/modules/api/pom.xml
   jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/examples/pom.xml
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-db.sh
   jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
Log:
standalone db test script

Modified: jbpm4/trunk/modules/api/pom.xml
===================================================================
--- jbpm4/trunk/modules/api/pom.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/api/pom.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -38,12 +38,23 @@
   <!-- Profiles -->
   <profiles>
     <profile>
-      <id>schemadocs</id>
+      <id>docs</id>
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+          </plugin>
 		      <plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-dependency-plugin</artifactId>

Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -77,6 +77,13 @@
       </includes>
     </fileSet>
     <fileSet>
+      <directory>../db/target/classes</directory>
+      <outputDirectory>install/src/db</outputDirectory>
+      <includes>
+        <include>*.sql</include>
+      </includes>
+    </fileSet>
+    <fileSet>
       <directory>../devguide/target/docbook/publish/en</directory>
       <outputDirectory>doc/devguide</outputDirectory>
       <excludes>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -13,16 +13,17 @@
 	<property name="mail.smtp.host" value="localhost" />
   <echo message="mail.smtp.host... ${mail.smtp.host}" />
 
-	<!-- INTERNAL PROPERTY DEFAULTS -->
+  <!-- INTERNAL PROPERTY DEFAULTS -->
   <property name="jbpm.version" value="4.1-SNAPSHOT" />
   <property name="jbpm.parent.dir" value="../.." />
   <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" />
-
+  <property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
+  <property name="logging" value="jdk" /> <!-- jdk | provided -->
   <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" />
-
-	<property name="hibernate.connection.type" value="jdbc" /> <!-- jdbc | datasource -->
-  <property name="logging" value="jdk" /> <!-- jdk | provided -->
-	
+  <property name="install.src.dir" value="${jbpm.home}/install/src" />
+  <property name="jdbc.properties.dir" value="${install.src.dir}/jdbc" />
+  <property name="mail.cfg" value="default" />
+  
   <property name="tomcat.version" value="6.0.20" />
   <property name="tomcat.parent.dir" value="${jbpm.home}" />
   <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" />
@@ -35,48 +36,61 @@
   <property name="jboss.parent.dir" value="${jbpm.home}" />
   <property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" />
   <property name="jboss.filename" value="jboss-${jboss.version}.zip" />
-	<property name="jboss.distro.dir" value="downloads" />
+  <property name="jboss.distro.dir" value="downloads" />
   <property name="jboss.distro.url" value="http://downloads.sourceforge.net/jboss/${jboss.filename}" />
   <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" />
   <property name="jboss.server.configuration" value="default" />
   <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
   <property name="jboss.server.data.dir" value="${jboss.home}/server/${jboss.server.configuration}/data" />
 
+  <!-- ### CLEAN CONFIGURATION DIR ########################################### -->
+  <target name="clean.cfg.dir" description="Deletes the ${cfg.dest.dir}">
+    <delete dir="${cfg.dest.dir}" />
+  </target>
+  	
   <!-- ### CREATE CONFIGURATION ########################################### -->
-	<target name="create.cfg" description="Creates a configuration in dir generated/cfg">
-    <delete dir="${jbpm.home}/install/generated/cfg" />
-    <mkdir dir="${jbpm.home}/install/generated/cfg" />
-		<copy tofile="${jbpm.home}/install/generated/cfg/jbpm.cfg.xml" 
-			    file="${jbpm.home}/install/src/cfg/jbpm/${tx}.jbpm.cfg.xml" />
-    <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.hibernate.cfg.xml" 
-    	    file="${jbpm.home}/install/src/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml">
-      <filterset filtersfile="${jbpm.home}/install/src/jdbc/${database}.properties" />
+  <target name="create.cfg" description="Creates a configuration in ${cfg.dest.dir}">
+    <echo message="${cfg.dest.dir}" />
+    <echo message="${install.src.dir}" />
+    <echo message="${jdbc.properties.dir}" />
+    <echo message="${user.dir}" />
+  	<echo message="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml" />
+    <mkdir dir="${cfg.dest.dir}" />
+    <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml" 
+          file="${install.src.dir}/cfg/jbpm/${tx}.jbpm.cfg.xml"
+          overwrite="true" />
+    <copy tofile="${cfg.dest.dir}/jbpm.hibernate.cfg.xml" 
+          file="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml"
+    	    overwrite="true">
+      <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
     </copy>
-    <copy todir="${jbpm.home}/install/generated/cfg">
-    	<fileset dir="${jbpm.home}/install/src/cfg/logging/${logging}" />
+    <copy todir="${cfg.dest.dir}"
+    	    overwrite="true">
+      <fileset dir="${install.src.dir}/cfg/logging/${logging}" />
     </copy>
-    <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.mail.properties" 
-          file="${jbpm.home}/install/src/cfg/mail/jbpm.mail.properties">
+    <copy tofile="${cfg.dest.dir}/jbpm.mail.properties" 
+          file="${install.src.dir}/cfg/mail/jbpm.mail.${mail.cfg}.properties" 
+    	    overwrite="true">
       <filterset>
-      	<filter token="mail.smtp.host" value="${mail.smtp.host}" />
+        <filter token="mail.smtp.host" value="${mail.smtp.host}" />
       </filterset>
     </copy>
-	</target>
+  </target>
 
   <!-- ### CREATE USER WEBAPP ########################################## -->
   <target name="create.user.webapp"
-  	      depends="create.cfg"
-  	      description="Generates a configuration in dir generated/cfg">
+          depends="create.cfg"
+          description="Generates a configuration in dir generated/cfg">
     <delete dir="${jbpm.home}/install/generated/user-webapp" />
     <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes" />
     <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
-  	<copy todir="${jbpm.home}/install/generated/user-webapp">
-  		<fileset dir="${jbpm.home}/install/src/user-webapp"/>
+    <copy todir="${jbpm.home}/install/generated/user-webapp">
+      <fileset dir="${install.src.dir}/user-webapp"/>
     </copy>
-  	<copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes">
-  		<fileset dir="${jbpm.home}/install/generated/cfg">
-  			<exclude name="logging.properties" />
-  		</fileset>
+    <copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes">
+      <fileset dir="${cfg.dest.dir}">
+        <exclude name="logging.properties" />
+      </fileset>
     </copy>
     <copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib">
       <fileset dir="${jbpm.home}">
@@ -99,10 +113,10 @@
         <include name="slf4j-jdk14.jar" />
       </fileset>
     </copy>
-  	
+    
     <!-- copy database driver -->
     <property name="database.driver.destination.dir" value="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
-  	<property name="is.tomcat" value="true" />
+    <property name="is.tomcat" value="true" />
     <antcall target="internal.copy.database.driver" />
   </target>
 
@@ -225,8 +239,8 @@
       </fileset>
     </copy>
 
-  	<property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
-  	<antcall target="internal.copy.database.driver" />
+    <property name="container.lib.dir" value="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" />
+    <antcall target="internal.copy.database.driver" />
   </target>
 
   <!-- ### START JBOSS ################################################### -->
@@ -320,7 +334,7 @@
         <include name="mail.jar" />
         <include name="slf4j-api.jar" />
         <include name="slf4j-jdk14.jar" />
-      	<include name="gwt-console-server-integration.jar" />
+        <include name="gwt-console-server-integration.jar" />
         <include name="gwt-console-rpc.jar" />
         <include name="jbpm-console-integration.jar" />
         <include name="jbpm-console-form-plugin.jar" />
@@ -365,13 +379,13 @@
   <target name="stop.tomcat" 
           description="Signals Tomcat to stop, but doesn't wait till its finished">
     <exec executable="${tomcat.home}/bin/catalina.bat"
-    	    dir="${tomcat.home}/bin"
-    	    os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+          dir="${tomcat.home}/bin"
+          os="Windows Vista, Windows XP,Windows 2000,Windows 98">
       <arg line="stop"/>
     </exec>
     <exec executable="${tomcat.home}/bin/catalina.sh" 
           dir="${tomcat.home}/bin"
-    	    os="Linux, Unix, Mac">
+          os="Linux, Unix, Mac">
       <arg line="stop"/>
     </exec>
   </target>
@@ -391,18 +405,91 @@
       <equals arg1="${database}" arg2="postgresql" />
     </condition>
     <condition property="database.driver" value="hsqldb.jar">
-    	<and>
+      <and>
         <equals arg1="${database}" arg2="hsqldb" />
-    		<equals arg1="${is.tomcat}" arg2="true" />
+        <equals arg1="${is.tomcat}" arg2="true" />
       </and>
     </condition>
-  	<antcall target="internal.copy.database.driver.if.needed" />
+    <antcall target="internal.copy.database.driver.if.needed" />
   </target>
-  	
+	
+	
+  <!-- ### CREATE JBPM SCHEMA ############################################# -->
+  <target name="create.jbpm.schema" 
+          description="creates the jbpm tables in the database">
+  	<property file="${jbpm.home}/install/src/jdbc/${database}.properties" />
+    <sql driver="${jdbc.driver}"
+         url="${jdbc.url}"
+         userid="${jdbc.username}"
+         password="${jdbc.password}"
+         onerror="continue"
+         src="${jbpm.home}/install/src/db/jbpm.${database}.create.sql">
+      <classpath>
+        <fileset dir="${jbpm.home}/lib">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </sql>
+  </target>
+
+  <!-- ### DROP JBPM SCHEMA ############################################### -->
+  <target name="drop.jbpm.schema" 
+          description="drops the jbpm tables from the database">
+    <property file="${jbpm.home}/install/src/jdbc/${database}.properties" />
+    <echo message="database....... ${database}" />
+    <echo message="jdbc.driver.... ${jdbc.driver}" />
+    <echo message="jdbc.url....... ${jdbc.url}" />
+    <echo message="jdbc.username.. ${jdbc.username}" />
+    <sql driver="${jdbc.driver}"
+         url="${jdbc.url}"
+         userid="${jdbc.username}"
+         password="${jdbc.password}"
+         onerror="continue"
+         src="${jbpm.home}/install/src/db/jbpm.${database}.drop.sql">
+      <classpath>
+        <fileset dir="${jbpm.home}/lib">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </sql>
+  </target>
+
+  <!-- ### LOAD EXAMPLE IDENTITIES ######################################## -->
+  <target name="load.example.identities"
+          description="loads the example users and groups into the database">
+    <sql driver="${jdbc.driver}"
+         url="${jdbc.url}"
+         userid="${jdbc.username}"
+         password="${jdbc.password}"
+         onerror="continue">
+      <transaction src="${jbpm.home}/db/example.identities.sql"/>
+      <classpath>
+        <fileset dir="${jbpm.home}/lib">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </sql>
+  </target>
+
+
+  <!-- ### START HSQLDB DATABASE MGR ##################################### -->
+  <target name="hsqldb.databasemanager"
+          description="start the hsqldb database manager">
+    <java classname="org.hsqldb.util.DatabaseManager" fork="true">
+      <arg line="-url jdbc:hsqldb:hsql://localhost:1701"/>
+      <classpath>
+        <fileset dir="${jbpm.home}/lib">
+          <include name="hsqldb.jar"/>
+        </fileset>
+      </classpath>
+    </java>
+  </target>
+
+    
   <target name="internal.copy.database.driver.if.needed" if="database.driver">
     <available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" />
     <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" />
     <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" />
-	</target>
+  </target>
 
 </project>

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.tx.jta.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.tx.spring.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.tx.hibernate.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties (from rev 5489, jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host=@mail.smtp.host@
+mail.smtp.port=25
+mail.from=noreply at jbpm.org


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.default.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties	2009-08-20 07:04:51 UTC (rev 5496)
@@ -1,3 +0,0 @@
-mail.smtp.host=@mail.smtp.host@
-mail.smtp.port=25
-mail.from=noreply at jbpm.org

Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties (from rev 5489, jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.properties)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host	localhost
+mail.smtp.port	2525
+mail.from		noreply at jbpm.org
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/mail/jbpm.mail.testsuite.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/examples/pom.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -123,7 +123,7 @@
 
     <!-- -Ddatabase= -->
     <profile>
-      <id>standalone.tests</id>
+      <id>run.database.testsuite</id>
       <activation>
         <property>
           <name>database</name>
@@ -143,27 +143,21 @@
                 <configuration>
                   <tasks>
                     <echo message="database: ${database}" />
-                    <available property="qa.database.props.available" file="../../qa/jdbc/${database}.properties" />
-                    <echo message="qa.database.props.available: ${qa.database.props.available}" />
-                    <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>
+                    <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">
+                      <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>

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/reminder/TaskReminderTest.java	2009-08-20 07:04:51 UTC (rev 5496)
@@ -33,20 +33,19 @@
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import org.subethamail.wiser.Wiser;
-import org.subethamail.wiser.WiserMessage;
-
 import org.jbpm.api.ProcessInstance;
 import org.jbpm.api.job.Job;
 import org.jbpm.api.task.Task;
 import org.jbpm.examples.task.assignee.Order;
 import org.jbpm.test.JbpmTestCase;
+import org.subethamail.wiser.Wiser;
+import org.subethamail.wiser.WiserMessage;
 
 /**
  * @author Alejandro Guizar
  */
 public class TaskReminderTest extends JbpmTestCase {
-
+  
   Wiser wiser = new Wiser();
 
   protected void setUp() throws Exception {

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/pom.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -470,6 +470,15 @@
   </build>
 
   <profiles>
+    <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
+    <profile>
+      <id>docs</id>
+      <modules>
+        <module>modules/devguide</module>
+        <module>modules/userguide</module>
+      </modules>
+    </profile>
+
     <!-- PROFILE DISTRO
     -Pdistro 
     -->
@@ -478,8 +487,6 @@
       <modules>
         <module>modules/enterprise</module>
         <module>modules/db</module>
-        <module>modules/devguide</module>
-        <module>modules/userguide</module>
         <module>modules/distro</module>
       </modules>
       <properties>
@@ -494,17 +501,6 @@
             </configuration>
           </plugin>
           <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <artifactId>maven-source-plugin</artifactId>
             <executions>
               <execution>
@@ -519,6 +515,14 @@
       </build>
     </profile>
 
+    <!-- schema for direct db integration test. see qa\hudson-jbpm4-db.* -->
+    <profile>
+      <id>schema</id>
+      <modules>
+        <module>modules/db</module>
+      </modules>
+    </profile>
+
     <!-- PROFILE NO-DATABASE
     The default configurations are based on hsqldb 
     -->

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/build.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -43,8 +43,35 @@
           description="deletes the jbpm installation and then reinstalls jbpm">
     <delete dir="${jbpm.home}" />
     <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />
+
+    <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
+    <copy file="jdbc/${database}.properties" 
+          todir="${jbpm.home}/install/src/jdbc" 
+          overwrite="true" 
+          failonerror="false" />
+    <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
+    <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" 
+          todir="${jbpm.home}/install/src/jdbc" 
+          overwrite="true" 
+          failonerror="false" />
+    <!-- copy the oracle jar as it is not allowed to be part of our distro -->
+    <copy file="../modules/distro/target/libs/ojdbc14.jar" 
+          todir="${jbpm.home}/lib"/>
 	</target>
 
+  <!-- DB INTEGRATION TESTSUITE SETUP -->
+  <target name="db.integration.testsuite.setup"
+          depends="reinstall.jbpm">
+    <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema">
+    </ant>
+    <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
+  </target>
+
+  <!-- DB INTEGRATION TESTSUITE TEARDOWN -->
+  <target name="db.integration.testsuite.teardown">
+    <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
+  </target>
+
   <!-- TOMCAT INTEGRATION TESTSUITE SETUP -->
   <target name="tomcat.integration.testsuite.setup"
   	      depends="reinstall.jbpm"> 
@@ -87,7 +114,7 @@
 
 	
 	<target name="integration.testrun.setup" 
-          depends="reinstall.jbpm, post.install"
+          depends="reinstall.jbpm"
           description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
     <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
     
@@ -132,26 +159,6 @@
     <copy file="jboss/jboss-log4j.xml" todir="${jboss.server.config.dir}/conf" overwrite="true" />
   </target>
 
-  <target name="post.install">
-        <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory -->
-    <copy file="jdbc/${database}.properties" 
-          todir="${jbpm.home}/db/jdbc" 
-          overwrite="true" 
-          failonerror="false" />
-    <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties -->
-    <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" 
-          todir="${jbpm.home}/db/jdbc" 
-          overwrite="true" 
-          failonerror="false" />
-    <!-- copy the oracle jar as it is not allowed to be part of our distro -->
-    <copy file="../modules/distro/target/libs/ojdbc14.jar" 
-          todir="${jbpm.home}/lib"/>
-   
-    <!-- copy the jdbc configuration and oracle jar to jbossidm  -->
-    <antcall target="copy.jbossidm.jdbc.configuration" />
-
-  </target>
-
   <condition property="identity.component.idm">
     <equals arg1="${identity.component}" arg2="jboss.idm"/>
   </condition>

Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.tx.hibernate.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+
+  <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties	                        (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,3 @@
+mail.smtp.host = localhost
+mail.smtp.port = 2525
+mail.from      = noreply at jbpm.org
\ No newline at end of file


Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
===================================================================
--- jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml	                        (rev 0)
+++ jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <process-engine-context>
+
+    <mail-template name="rectify-template">
+      <to addresses="${addressee}" />
+      <cc users="bb" groups="innerparty" />
+      <bcc groups="thinkpol" />
+      <subject>rectify ${newspaper}</subject>
+      <text>${newspaper} ${date} ${details}</text>
+    </mail-template>
+
+  </process-engine-context>
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/qa/cfg/testsuite.db/jbpm.mail.templates.examples.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/qa/hudson-jbpm4-db.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.bat	                        (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.bat	2009-08-20 07:04:51 UTC (rev 5496)
@@ -0,0 +1,8 @@
+ at echo off
+
+ at echo database: %1
+
+cmd /C mvn -U -Pdistro clean install
+cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.setup
+cmd /C mvn -Ddatabase=%1 test
+cmd /C ant -f qa/build.xml -Ddatabase=%1 db.integration.testsuite.teardown

Modified: jbpm4/trunk/qa/hudson-jbpm4-db.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-db.sh	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/hudson-jbpm4-db.sh	2009-08-20 07:04:51 UTC (rev 5496)
@@ -3,3 +3,6 @@
 # runs the smoke test suite
 
 mvn -U -Ddatabase=$DATABASE clean install
+ant -f qa/build.xml $ANT_PROPERTIES database.drop database.create
+mvn -Ddatabase=$DATABASE test
+ant -f qa/build.xml $ANT_PROPERTIES database.drop

Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-08-20 06:44:08 UTC (rev 5495)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat	2009-08-20 07:04:51 UTC (rev 5496)
@@ -3,7 +3,7 @@
 
 cmd /C ant -f modules/distro/src/main/files/jboss/build.xml reinstall.jbossidm
 
-cmd /C mvn -U -Pdistro -Pschemadocs clean install
+cmd /C mvn -U -Pdistro clean install
 
 cmd /C ant -f qa/build.xml -Djbpm.debug=true integration.testrun.setup
 



More information about the jbpm-commits mailing list