svn commit: r1805158 - in /ofbiz/ofbiz-framework/trunk/framework/service: config/service.properties src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java

Author: jleroux
Date: Wed Aug 16 09:15:00 2017
New Revision: 1805158

URL: http://svn.apache.org/viewvc?rev=1805158&view=rev
Log:
Improved: Enable/Disable JMS
(OFBIZ-4454)

Allows to Enable/Disable JMS with a service properties

Thanks: Adrian for report Dimitri Unruh for creating the Jira

Modified:
    ofbiz/ofbiz-framework/trunk/framework/service/config/service.properties
    ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java

Modified: ofbiz/ofbiz-framework/trunk/framework/service/config/service.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/config/service.properties?rev=1805158&r1=1805157&r2=1805158&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/config/service.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/config/service.properties Wed Aug 16 09:15:00 2017
@@ -25,3 +25,5 @@ secureSoapAnswer=true
 showServiceDurationThreshold=0
 # By default shows/marks slow services in logs by using a 1000 ms value
 showSlowServiceThreshold=1000
+# enable JMS or not
+enableJMS=true
\ No newline at end of file

Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java?rev=1805158&r1=1805157&r2=1805158&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceDispatcher.java Wed Aug 16 09:15:00 2017
@@ -74,7 +74,7 @@ public class ServiceDispatcher {
     // FIXME: These fields are not thread-safe. They are modified by EntityDataLoadContainer.
     // We need a better design - like have this class query EntityDataLoadContainer if data is being loaded.
     protected static boolean enableJM = true;
-    protected static boolean enableJMS = true;
+    protected static boolean enableJMS = UtilProperties.getPropertyAsBoolean("service", "enableJMS", true);
     protected static boolean enableSvcs = true;
 
     protected Delegator delegator = null;