Author: jleroux
Date: Fri Mar 10 09:45:30 2017
New Revision: 1786314
URL: http://svn.apache.org/viewvc?rev=1786314&view=rev
Log:
"Applied fix from trunk framework for revision: 1786214"
------------------------------------------------------------------------
r1786214 | jleroux | 2017-03-09 19:11:06 +0100 (jeu. 09 mars 2017) | 2 lignes
No functional change, I missed this so far but strangely it did not seem to
have any impact during tests
------------------------------------------------------------------------
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/framework/common/servicedef/services_test.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 10 09:45:30 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified:
ofbiz/branches/release16.11/framework/common/servicedef/services_test.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/common/servicedef/services_test.xml?rev=1786314&r1=1786313&r2=1786314&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/common/servicedef/services_test.xml
(original)
+++ ofbiz/branches/release16.11/framework/common/servicedef/services_test.xml
Fri Mar 10 09:45:30 2017
@@ -88,11 +88,12 @@ under the License.
</service>
<!-- test service for local loopback testing (OFBiz Client SOAP -> OFBiz
Server SOAP)
- http://ofbiz-vm.apache.org:8080/webtools/control/SOAPService is the
ultimate location for the testRemoteSoap
- (it's redirected from
http://demo-trunk-ofbiz.apache.org/webtools/control/SOAPService by the SSL ASF
proxy)
+ https://ofbiz-vm2.apache.org:8443/webtools/control/SOAPService is the
ultimate location for the testRemoteSoap
+ It's redirected from
https://demo-trunk.ofbiz.apache.org/webtools/control/SOAPService by the HTTPD
frontend installed by Puppet in the demo server, ie ofbiz-vm2.apache.org
+ We could use also
http://demo-trunk.ofbiz.apache.org/webtools/control/SOAPService but HSTS would
sent it to https anyway
So this can be used only against trunk demo and is not in the tests
set to avoid a dependency on Internet -->
<service name="testRemoteSoap" engine="soap" export="true"
- location="http://ofbiz-vm.apache.org:8080/webtools/control/SOAPService";
+
location="https://demo-trunk.ofbiz.apache.org/webtools/control/SOAPService";
invoke="testSoapSimple">
<attribute name="defaultValue" type="Double" mode="IN"
default-value="999.9999"/>
<attribute name="message" type="String" mode="IN" optional="true"/>
