[jboss-svn-commits] JBL Code SVN: r20192 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task: src/org/jbpm/ant and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2008-05-28 08:59:53 -0400 (Wed, 28 May 2008)
New Revision: 20192

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/build.xml
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java
Log:
Include ant task in build and fix tests: JBESB-1775

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/build.xml	2008-05-28 11:49:36 UTC (rev 20191)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/build.xml	2008-05-28 12:59:53 UTC (rev 20192)
@@ -1,21 +1,20 @@
 <project name="jbpm-ant-task" default="build-task" basedir=".">
-
+	<property name="jbpm.jar.file" location="build/jbpm-ant.jar"/>
+	
 	<path id="classpath">
 		<pathelement location="src/test/resources"/>
-			<pathelement location="build/classes" />
-			<pathelement location="build/test/classes" />
 			<pathelement location="${basedir}/../../../lib/ext/commons-codec-1.3.jar" />
 			<pathelement location="${basedir}/../../../lib/ext/junit-4.1.jar" />
 			<pathelement location="${basedir}/../../../lib/ext/commons-httpclient.jar" />
+			<pathelement location="${ant.library.dir}/ant.jar" />
 	</path>
 	
-
 	<target name="build-task">
 		<mkdir dir="build/classes"/>
 		<javac srcdir="src" destdir="build/classes" debug="on" >
 			<classpath refid="classpath" />
 		</javac>
-		<jar basedir="build/classes" destfile="build/jbpm-ant.jar" includes="**/*.class"/>
+		<jar basedir="build/classes" destfile="${jbpm.jar.file}" includes="**/*.class"/>
 	</target>
 
 </project>

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java	2008-05-28 11:49:36 UTC (rev 20191)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/DeployProcessToServerTask.java	2008-05-28 12:59:53 UTC (rev 20192)
@@ -176,8 +176,7 @@
                 }
             }
         } catch (Exception e) {
-        	log(e,1 );
-            throw new BuildException( "couldn't deploy process archives : " + e.getMessage() );
+            throw new BuildException( "couldn't deploy process archives : " + e.getMessage(), e);
         }
     }
 
@@ -186,7 +185,10 @@
     }
 
     public void deployProcessWithServlet(final String serverName, final String serverPort, final String serverDeployer, final byte[] parBytes) throws Exception {
-        
+        log(deployProcess(serverName, serverPort, serverDeployer, parBytes));
+    }
+    
+    String deployProcess(final String serverName, final String serverPort, final String serverDeployer, final byte[] parBytes) throws Exception {
         String sessionID = null; 
         //	pass security credentials if specified.
         boolean security = verifySecurityProperties();
@@ -225,7 +227,7 @@
         while ((read = inputStream.read()) != -1) {
             result.append((char)read);
         }
-        log(result.toString());
+        return result.toString() ;
     }
     
     /**
@@ -345,5 +347,4 @@
     public static String encode (String source) {
         return new String( new Base64().encode( source.getBytes() ));
     }
-
 }
\ No newline at end of file

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java	2008-05-28 11:49:36 UTC (rev 20191)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/services/jbpm/ant-task/src/org/jbpm/ant/ProcessDeployer.java	2008-05-28 12:59:53 UTC (rev 20192)
@@ -48,6 +48,6 @@
     	
     	zipOutputStream.close();
     	
-    	dptt.deployProcessWithServlet(serverName, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
+    	dptt.deployProcess(serverName, serverPort, serverDeployer, byteArrayOutputStream.toByteArray());
     }   
 }