svn commit: r1624814 - in /ofbiz/branches/release13.07: ./ framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java

Author: jleroux
Date: Sun Sep 14 08:50:27 2014
New Revision: 1624814

URL: http://svn.apache.org/r1624814
Log:
"Applied fix from trunk for revision: 1624809" (conflicts handled by hand)
------------------------------------------------------------------------
r1624809 | jleroux | 2014-09-14 10:37:46 +0200 (dim. 14 sept. 2014) | 1 ligne

OFBIZ-5770 - Removes the harcoded ports related with service locations introduced with OFBIZ-4794
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
    ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1624809

Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java?rev=1624814&r1=1624813&r2=1624814&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java (original)
+++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/config/model/ServiceEngine.java Sun Sep 14 08:50:27 2014
@@ -89,10 +89,10 @@ public final class ServiceEngine {
             for (Element serviceLocationElement : serviceLocationElementList) {
                 String location = serviceLocationElement.getAttribute("location").intern();
                 if (location.contains("localhost") && Start.getInstance().getConfig().portOffset != 0) {
-                    Integer port = 1099 + Start.getInstance().getConfig().portOffset;
-                    location = location.replace("1099", port.toString());
-                    port = 8080 + ClassLoaderContainer.portOffset;
-                    location = location.replace("8080", port.toString());
+                    String s = location.substring(location.lastIndexOf(":") + 1);                        
+                    Integer locationPort = Integer.valueOf(s.substring(0, s.indexOf("/")));                    
+                    Integer port = locationPort + Start.getInstance().getConfig().portOffset;
+                    location = location.replace(locationPort.toString(), port.toString());
                 }
                 serviceLocations.add(new ServiceLocation(serviceLocationElement, location));
             }

Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java?rev=1624814&r1=1624813&r2=1624814&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java (original)
+++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/XMLRPCClientEngine.java Sun Sep 14 08:50:27 2014
@@ -91,9 +91,11 @@ public class XMLRPCClientEngine extends
         String keyAlias  = null;
         try {
             url = ServiceConfigUtil.getEngineParameter(engine, "url");
-            if (ClassLoaderContainer.portOffset != 0) {
-                Integer port = 8080 + ClassLoaderContainer.portOffset;
-                url = url.replace("8080", port.toString());
+            if (Start.getInstance().getConfig().portOffset != 0) {
+                String s = url.substring(url.lastIndexOf(":") + 1);                        
+                Integer rpcPort = Integer.valueOf(s.substring(0, s.indexOf("/")));
+                Integer port = rpcPort + Start.getInstance().getConfig().portOffset;
+                url = url.replace(rpcPort.toString(), port.toString());
             }
             login = ServiceConfigUtil.getEngineParameter(engine, "login");
             password = ServiceConfigUtil.getEngineParameter(engine, "password");