[jbpm-commits] JBoss JBPM SVN: r5755 - in jbpm4/trunk/modules: distro/src/main/files/install/src/cfg/jbpm and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Oct 19 08:15:41 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-10-19 08:15:40 -0400 (Mon, 19 Oct 2009)
New Revision: 5755

Added:
   jbpm4/trunk/modules/pvm/src/main/resources/jbpm.console.cfg.xml
Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.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.jbpm.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java
   jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
Log:
renamed jbpm.console.webservice.port (and host) to jbpm.console.server.port and fixed tomcat setup for these properties

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -73,7 +73,7 @@
     <or>
       <os family="unix" />
       <os family="mac" />
-      <os family="sunos" />
+      <os name="sunos" />
     </or>
   </condition>
   <condition property="hsqldb.needed">
@@ -434,7 +434,7 @@
 
     <!-- create the jbpm configuration jar file and drop in /lib -->
     <jar destfile="${tomcat.home}/lib/jbpm.cfg.jar">
-      <fileset dir="generated/cfg">
+      <fileset dir="${jbpm.home}/install/generated/cfg">
         <exclude name="logging.properties"/>
       </fileset>
     </jar>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -7,6 +7,7 @@
   <import resource="jbpm.jpdl.cfg.xml" />
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
   <import resource="jbpm.jobexecutor.cfg.xml" />
 
 </jbpm-configuration>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -7,6 +7,7 @@
   <import resource="jbpm.jpdl.cfg.xml" />
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
   <import resource="jbpm.jobexecutor.cfg.xml" />
 
 </jbpm-configuration>

Modified: 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	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -7,6 +7,7 @@
   <import resource="jbpm.jpdl.cfg.xml" />
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
   <import resource="jbpm.mail.templates.examples.xml" />
 
 </jbpm-configuration>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -7,6 +7,7 @@
   <import resource="jbpm.jpdl.cfg.xml" />
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
   <import resource="jbpm.jobexecutor.cfg.xml" />
 
 </jbpm-configuration>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/config/deploy/jbpm/jbpm-service.sar/jbpm.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -8,10 +8,6 @@
   <import resource="jbpm.jpdl.cfg.xml" />
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.jobexecutor.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
 
-  <process-engine-context>
-    <string name="jbpm.console.webservice.host" value="localhost" />
-    <string name="jbpm.console.webservice.port" value="8080" />
-  </process-engine-context>
-
 </jbpm-configuration>

Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/AbstractFormDispatcher.java	2009-10-19 12:15:40 UTC (rev 5755)
@@ -78,13 +78,13 @@
       this.processEngine = Configuration.getProcessEngine();
     }
     
-    this.webServiceHost = (String) processEngine.get("jbpm.console.webservice.host");
-    this.webServicePort = (String) processEngine.get("jbpm.console.webservice.port");
+    this.webServiceHost = (String) processEngine.get("jbpm.console.server.host");
+    this.webServicePort = (String) processEngine.get("jbpm.console.server.port");
     
     if ( (webServiceHost==null)
          || (webServicePort==null)
        ) {
-      throw new JbpmException("make sure that strings 'jbpm.console.webservice.host' and 'jbpm.console.webservice.port' are properly configured in the process-engine-context of jbpm.cfg.xml");
+      throw new JbpmException("make sure that strings 'jbpm.console.server.host' and 'jbpm.console.server.port' are properly configured in the process-engine-context of jbpm.cfg.xml");
     }
   }
 

Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java	2009-10-19 09:04:45 UTC (rev 5754)
+++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java	2009-10-19 12:15:40 UTC (rev 5755)
@@ -69,13 +69,13 @@
       this.processEngine = Configuration.getProcessEngine();
     }
     
-    this.webServiceHost = (String) processEngine.get("jbpm.console.webservice.host");
-    this.webServicePort = (String) processEngine.get("jbpm.console.webservice.port");
+    this.webServiceHost = (String) processEngine.get("jbpm.console.server.host");
+    this.webServicePort = (String) processEngine.get("jbpm.console.server.port");
     
     if ( (webServiceHost==null)
          || (webServicePort==null)
        ) {
-      throw new JbpmException("make sure that strings 'jbpm.console.webservice.host' and 'jbpm.console.webservice.port' are properly configured in the process-engine-context of jbpm.cfg.xml");
+      throw new JbpmException("make sure that strings 'jbpm.console.server.host' and 'jbpm.console.server.port' are properly configured in the process-engine-context of jbpm.cfg.xml");
     }
   }
 

Added: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.console.cfg.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.console.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.console.cfg.xml	2009-10-19 12:15:40 UTC (rev 5755)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <process-engine-context>
+    <string name="jbpm.console.server.host" value="localhost" />
+    <string name="jbpm.console.server.port" value="8080" />
+  </process-engine-context>
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.console.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain



More information about the jbpm-commits mailing list