svn commit: r1787627 - in /ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start: Config.java load-data.properties rmi.properties start.properties test.properties

[Taher Alkhateeb]

Author: taher
Date: Sun Mar 19 14:55:13 2017
New Revision: 1787627

URL: http://svn.apache.org/viewvc?rev=1787627&view=rev
Log:
Fixed: Disabled the admin server from starting on contexts other than "start"

This commit has reference to the below discussion thread in which buildbot
is failing in between commits due to blocking the admin server thread.
The commit enables the admin server only for the "start" ofbiz server command.
For all other commands the port is set to value zero and hence the admin server
is never initialized

https://s.apache.org/xfxS

Modified:
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties
    ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties

Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java?rev=1787627&r1=1787626&r2=1787627&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/Config.java Sun Mar 19 14:55:13 2017
@@ -56,7 +56,7 @@ public final class Config {
         adminAddress = getAdminAddress(getProperty(props, "ofbiz.admin.host", "127.0.0.1"));
         adminKey = getProperty(props, "ofbiz.admin.key", "so3du5kasd5dn");
         portOffset = getPortOffsetValue(ofbizCommands, "0");
-        adminPort = getAdminPort(props, 10523, portOffset); // see INFRA-6790
+        adminPort = getAdminPort(props, 0, portOffset); // see INFRA-6790
         containerConfig = getAbsolutePath(props, "ofbiz.container.config",
                 "framework/base/config/ofbiz-containers.xml", ofbizHome);
         loaders = Arrays.asList(getProperty(props, "ofbiz.start.loaders", "").split(","));

Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties?rev=1787627&r1=1787626&r2=1787627&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/load-data.properties Sun Mar 19 14:55:13 2017
@@ -40,7 +40,7 @@ ofbiz.start.loaders=load-data
 # --- Network host, port and key used by the AdminClient to communicate
 #     with AdminServer for shutting down OFBiz or inquiring on status
 #     Default ofbiz.admin.host 127.0.0.1
-#     Default ofbiz.admin.port 10523
+#     Default ofbiz.admin.port 0
 #     Default ofbiz.admin.key so3du5kasd5dn
 #ofbiz.admin.host=
 #ofbiz.admin.port=

Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties?rev=1787627&r1=1787626&r2=1787627&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/rmi.properties Sun Mar 19 14:55:13 2017
@@ -40,7 +40,7 @@ ofbiz.start.loaders=rmi
 # --- Network host, port and key used by the AdminClient to communicate
 #     with AdminServer for shutting down OFBiz or inquiring on status
 #     Default ofbiz.admin.host 127.0.0.1
-#     Default ofbiz.admin.port 10523
+#     Default ofbiz.admin.port 0
 #     Default ofbiz.admin.key so3du5kasd5dn
 #ofbiz.admin.host=
 #ofbiz.admin.port=

Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties?rev=1787627&r1=1787626&r2=1787627&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/start.properties Sun Mar 19 14:55:13 2017
@@ -40,10 +40,10 @@ ofbiz.start.loaders=main
 # --- Network host, port and key used by the AdminClient to communicate
 #     with AdminServer for shutting down OFBiz or inquiring on status
 #     Default ofbiz.admin.host 127.0.0.1
-#     Default ofbiz.admin.port 10523
+#     Default ofbiz.admin.port 0
 #     Default ofbiz.admin.key so3du5kasd5dn
 #ofbiz.admin.host=
-#ofbiz.admin.port=
+ofbiz.admin.port=10523
 #ofbiz.admin.key=
 
 # -- Enable the JVM shutdown hook. Default is true

Modified: ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties?rev=1787627&r1=1787626&r2=1787627&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties (original)
+++ ofbiz/ofbiz-framework/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/test.properties Sun Mar 19 14:55:13 2017
@@ -40,7 +40,7 @@ ofbiz.start.loaders=test
 # --- Network host, port and key used by the AdminClient to communicate
 #     with AdminServer for shutting down OFBiz or inquiring on status
 #     Default ofbiz.admin.host 127.0.0.1
-#     Default ofbiz.admin.port 10523
+#     Default ofbiz.admin.port 0
 #     Default ofbiz.admin.key so3du5kasd5dn
 #ofbiz.admin.host=
 #ofbiz.admin.port=