[jbpm-commits] JBoss JBPM SVN: r4623 - in jbpm4/trunk: modules/distro/src/main/files/jboss and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-26 06:41:34 -0400 (Sun, 26 Apr 2009)
New Revision: 4623

Modified:
   jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
   jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/jbpm4-jboss.bat
   jbpm4/trunk/qa/jbpm4-jboss.sh
Log:
qa preparations

Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml	2009-04-26 10:41:34 UTC (rev 4623)
@@ -124,7 +124,7 @@
       <fileset dir="${jbpm.home}/lib">
         <include name="jbpm-spi.jar"/>
       </fileset>
-      <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config">
+      <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config/META-INF">
         <include name="jbpm-service-jboss-beans.xml"/>
       </fileset>
     </copy>

Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.jbossremote.cfg.xml	2009-04-26 10:41:34 UTC (rev 4623)
@@ -13,7 +13,7 @@
 
     <ejb-remote-command-service 
         initial-context-factory="org.jnp.interfaces.NamingContextFactory"
-        provider-url="jnp://@jboss.bind.address@"
+        provider-url="jnp://localhost"
         url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces">
       <retry-interceptor />
     </ejb-remote-command-service>

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/pom.xml	2009-04-26 10:41:34 UTC (rev 4623)
@@ -35,7 +35,6 @@
     <module>modules/test-base</module>
     <module>modules/pvm</module>
     <module>modules/jpdl</module>
-    <module>modules/db</module>
     <module>modules/integration</module>
     <module>modules/examples</module>
     <module>modules/test-db</module>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/qa/build.xml	2009-04-26 10:41:34 UTC (rev 4623)
@@ -65,7 +65,9 @@
 
   <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" />
 
-	<target name="integration.testrun.setup" depends="reinstall.jbpm">
+	<target name="integration.testrun.setup">
+    <ant antfile="${jbpm.home}/jboss/build.xml" target="stop.jboss" />
+		<antcall target="reinstall.jbpm" />
     <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />
     <ant antfile="${jbpm.home}/jboss/build.xml" target="install.jbpm.into.jboss" />
     <ant antfile="${jbpm.home}/jboss/build.xml" target="start.jboss" />

Modified: jbpm4/trunk/qa/jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.bat	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/qa/jbpm4-jboss.bat	2009-04-26 10:41:34 UTC (rev 4623)
@@ -1,7 +1,7 @@
 
 set MAVEN_OPTS=-Xms1024M -Xmx1024M
 
-rem cmd /C mvn -Pdistro -Pschemadocs clean install
+cmd /C mvn -Pdistro -Pschemadocs clean install
 
 cmd /C ant -f qa/build.xml integration.testrun.setup
 

Modified: jbpm4/trunk/qa/jbpm4-jboss.sh
===================================================================
--- jbpm4/trunk/qa/jbpm4-jboss.sh	2009-04-26 09:54:35 UTC (rev 4622)
+++ jbpm4/trunk/qa/jbpm4-jboss.sh	2009-04-26 10:41:34 UTC (rev 4623)
@@ -4,9 +4,12 @@
 
 set -x
 
-MAVEN_OPTS=-Xms1024M -Xmx1024M
-ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=~/.m2/repository
+ANT_PROPERTIES=-Ddatabase=$DATABASE -Djboss.version=$JBOSS_VERSION -Dworspace=$WORKSPACE -Dmaven.repo=/home/hudson/.m2/repository
 
+echo database........ $DATABASE
+echo jboss.version... $JBOSS_VERSION
+echo worspace........ $WORKSPACE
+
 mvn -Pdistro -Pschemadocs clean install
 
 ant -f qa/build.xml $ANT_PROPERTIES integration.testrun.setup