[jbpm-commits] JBoss JBPM SVN: r6432 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 22 23:06:09 EDT 2010


Author: alex.guizar at jboss.com
Date: 2010-06-22 23:06:09 -0400 (Tue, 22 Jun 2010)
New Revision: 6432

Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
Log:
JBPM-2893: simplify os conditions in install script
pass join flag to job dispatcher thread

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-06-22 23:17:42 UTC (rev 6431)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-06-23 03:06:09 UTC (rev 6432)
@@ -68,20 +68,13 @@
   <property name="signavio.tmp.dir" value="${jbpm.home}/install/generated/signavio-war" />
   <property name="signavio.repo.dir.name" value="signavio-repository" />
 
-  <!-- GENERAL CONDITIONS -->
+  <!-- CONTAINER CONDITIONS -->
   <condition property="is.jboss.distro.available">
     <available file="${jboss.distro.path}" />
   </condition>
   <condition property="is.tomcat.distro.available">
     <available file="${tomcat.distro.path}" />
   </condition>
-  <condition property="is.linux.unix.or.mac">
-    <or>
-      <os family="unix" />
-      <os family="mac" />
-      <os name="sunos" />
-    </or>
-  </condition>
   <condition property="is.hsqldb">
     <equals arg1="${database}" arg2="hsqldb" />
   </condition>
@@ -90,64 +83,42 @@
   <condition property="is.windows">
     <os family="windows" />
   </condition>
-  <condition property="is.not.windows">
-    <not>
-      <isset property="is.windows" />
-    </not>
+  <condition property="is.unix">
+    <os family="unix" />
   </condition>
 
-  <condition property="is.mac">
-    <os family="mac" />
-  </condition>
-
+  <!-- JBOSS CONDITIONS -->
   <condition property="is.jboss.500">
     <equals arg1="${jboss.version}" arg2="5.0.0.GA" />
   </condition>
-
   <condition property="is.jboss.510">
     <equals arg1="${jboss.version}" arg2="5.1.0.GA" />
   </condition>
 
-  <!-- ECLIPSE RELATED CONDITIONS -->
+  <!-- ECLIPSE CONDITIONS -->
   <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip">
-    <contains string="${os.name}" casesensitive="false" substring="win" />
+    <os family="windows" />
   </condition>
   <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-cocoa.tar">
-    <contains string="${os.name}" casesensitive="false" substring="mac" />
+    <os name="Mac OS X" />
   </condition>
   <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
-    <contains string="${os.name}" casesensitive="false" substring="mac" />
+    <os name="Mac OS X" />
   </condition>
   <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar">
-    <and>
-      <contains string="${os.name}" casesensitive="false" substring="linux" />
-      <not>
-        <contains string="${os.arch}" casesensitive="false" substring="64" />
-      </not>
-    </and>
+    <os name="Linux" arch="i386" />
   </condition>
   <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
-    <and>
-      <contains string="${os.name}" casesensitive="false" substring="linux" />
-      <not>
-        <contains string="${os.arch}" casesensitive="false" substring="64" />
-      </not>
-    </and>
+    <os name="Linux" arch="i386" />
   </condition>
   <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar">
-    <and>
-      <contains string="${os.name}" casesensitive="false" substring="linux" />
-      <contains string="${os.arch}" casesensitive="false" substring="64" />
-    </and>
+    <os name="Linux" arch="x86_64" />
   </condition>
   <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz">
-    <and>
-      <contains string="${os.name}" casesensitive="false" substring="linux" />
-      <contains string="${os.arch}" casesensitive="false" substring="64" />
-    </and>
+    <os name="Linux" arch="x86_64" />
   </condition>
   <property name="eclipse.distro.url"
-            value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/galileo/R/${eclipse.filename}" />
+            value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/galileo/R/${eclipse.filename}" />
   <property name="eclipse.distro.dir" value="downloads" />
   <property name="eclipse.parent.dir" value="${jbpm.home}" />
   <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" />
@@ -492,10 +463,10 @@
           depends="get.tomcat"
           description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
     <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
-    <antcall target="install.tomcat.linuxandmac" />
+    <antcall target="install.tomcat.unix" />
   </target>
 
-  <target name="install.tomcat.linuxandmac" if="is.linux.unix.or.mac">
+  <target name="install.tomcat.unix" if="is.unix">
     <chmod perm="a+x">
       <fileset dir="${tomcat.home}/bin">
         <include name="*.sh" />
@@ -801,8 +772,8 @@
   <target name="install.eclipse"
           depends="get.eclipse"
           description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}">
+    <antcall target="internal.install.eclipse.unix" />
     <antcall target="internal.install.eclipse.windows" />
-    <antcall target="internal.install.eclipse.non.windows" />
   </target>
 
   <!-- ### GET ECLIPSE ##################################################### -->
@@ -952,7 +923,7 @@
            overwrite="true" />
   </target>
 
-  <target name="internal.install.eclipse.non.windows" if="is.not.windows">
+  <target name="internal.install.eclipse.unix" if="is.unix">
     <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" />
     <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}"
            dest="${jbpm.home}"

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java	2010-06-22 23:17:42 UTC (rev 6431)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java	2010-06-23 03:06:09 UTC (rev 6432)
@@ -129,7 +129,7 @@
     log.debug("stopping job executor");
     if (isActive) {
       isActive = false;
-      dispatcherThread.deactivate(true);
+      dispatcherThread.deactivate(join);
       threadPool.shutdown();
       if (join) {
         try {



More information about the jbpm-commits mailing list