[jboss-svn-commits] JBL Code SVN: r18133 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts: src/org/jboss/soa/esb/quickstart/test and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2008-01-25 16:30:56 -0500 (Fri, 25 Jan 2008)
New Revision: 18133

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java
Log:
bug:JBESB-1518
Remove the use of sending a message to deploy a process, and use
the functionality of the ant task which does it via servlet.


Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml	2008-01-25 21:30:08 UTC (rev 18132)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/build.xml	2008-01-25 21:30:56 UTC (rev 18133)
@@ -58,6 +58,9 @@
       <fileset dir="${product.dir}/services/jbossesb/build">
     	 <include name="**/*.jar"/> 
       </fileset>
+      <fileset dir="${product.dir}/services/jbpm/lib/ext">
+	 <include name="jbpm-ant.jar"/>
+      </fileset>
       <!-- include qs specific jars -->
       <fileset dir="${org.jboss.esb.test.quickstarts.dir}">
          <include name="bpm_orchestration1/lib/**/*.jar"/>
@@ -182,7 +185,6 @@
 
       <!-- Build the tests... -->
       <mkdir dir="${qa.quickstarts.classes}"/>
-
       <javac srcdir="${qa.quickstarts.src}" destdir="${qa.quickstarts.classes}" classpathref="qa.quickstarts.cp" debug="on"/>
       <jar jarfile="${qa.quickstarts.build.lib}/QuickstartMessageStoreServer.sar">
          <fileset dir="${qa.quickstarts.classes}">
@@ -371,7 +373,6 @@
                <exclude name="**/HelloWorldSQLActionTest.java"/>
 	       <exclude name="**/BPMOrchestration1Test.java"/>
 	       <!-- The following quickstart is broken -->
-	       <exclude name="**/BPMOrchestration2Test.java"/>
 	       <exclude name="**/BPMOrchestration3Test.java"/>
 	       <exclude name="**/HelloWorldFileNotifierTest.java"/>
                <exclude name="**/RecipientlistTest.java"/>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java	2008-01-25 21:30:08 UTC (rev 18132)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/BPMOrchestration2Test.java	2008-01-25 21:30:56 UTC (rev 18133)
@@ -20,11 +20,17 @@
  */
 package org.jboss.soa.esb.quickstart.test;
 
+import java.io.File;
+import java.util.ArrayList;
+
 import junit.framework.Test;
 
 import org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageDeploy;
 import org.jboss.soa.esb.samples.quickstarts.bpm_orchestration2.test.SendJMSMessageStart;
 
+import org.jbpm.ant.DeployProcessToServerTask;
+import org.jbpm.ant.ProcessDeployer;
+
 /**
  * CI test for the bpmorchestration2 test.
  * 
@@ -45,9 +51,7 @@
 	}
 
 	public void testMessage() throws Exception {
-	    clearMessages() ;
 	    sendDeployMessage() ;
-	    checkMessages(30000, DEPLOY_DEF_MESSAGE, "Success:" + DEPLOY_DEF_MESSAGE) ;
 	    
 	    clearMessages() ;
 	    sendStartMessage() ;
@@ -62,13 +66,18 @@
 	}
 
 	public void sendDeployMessage() throws Exception {
-		SendJMSMessageDeploy sd = new SendJMSMessageDeploy();
-		sd.setupConnection();
-		sd.sendAMessage(DEPLOY_DEF_MESSAGE);
-		sd.stop();
+		ProcessDeployer pd = new ProcessDeployer();
+		ArrayList<File> files = new ArrayList<File>();
+		String processDef = Helpers.getQuickstartLocation("bpm_orchestration2/processDefinition");
+		File processDefDir = new File(processDef);
+		File[] processFiles = processDefDir.listFiles();
+		for (int i= 0; i< processFiles.length; i++) {
+			files.add(processFiles[i]);
+		}
+		pd.execute("localhost", "8080", "/jbpm-console/upload", files);
 	}
 	
-        public void sendStartMessage() throws Exception {
+	public void sendStartMessage() throws Exception {
 		SendJMSMessageStart sm = new SendJMSMessageStart();
 		sm.setupConnection();
 		sm.sendAMessage(GETTING_STARTED_MESSAGE);