Author: jleroux
Date: Thu Jul 11 05:38:47 2013
New Revision: 1502121
URL: http://svn.apache.org/r1502121
Log:
No functional change.
When I reverted r1311214 for "set different ports for testing in a CI
environment (e.g. Jenkins)" https://issues.apache.org/jira/browse/OFBIZ-4794 I
did not notice Jacopo's also changed some ports value at r1324614
This reverts r1324614 to have things consistent. I don't backport (only R12.04
is concerned) because as long as catalina/ofbiz-component.xml is consistent
(port =+ 1) things are working
Modified:
ofbiz/trunk/framework/catalina/ofbiz-component.xml
ofbiz/trunk/framework/common/servicedef/services_test.xml
ofbiz/trunk/framework/service/config/serviceengine.xml
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
Modified: ofbiz/trunk/framework/catalina/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/ofbiz-component.xml?rev=1502121&r1=1502120&r2=1502121&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/catalina/ofbiz-component.xml Thu Jul 11 05:38:47 2013
@@ -285,7 +285,7 @@ under the License.
<property name="maxThreads" value="100"/>
<property name="minSpareThreads" value="4"/>
<property name="noCompressionUserAgents" value=""/>
- <property name="port" value="8081"/>
+ <property name="port" value="8080"/>
<property name="restrictedUserAgents" value=""/>
<property name="server" value=""/>
<property name="socketBuffer" value="9000"/>
@@ -323,7 +323,7 @@ under the License.
<property name="maxThreads" value="100"/>
<property name="minSpareThreads" value="4"/>
<property name="noCompressionUserAgents" value=""/>
- <property name="port" value="8444"/>
+ <property name="port" value="8443"/>
<property name="restrictedUserAgents" value=""/>
<property name="server" value=""/>
<property name="socketBuffer" value="9000"/>
Modified: ofbiz/trunk/framework/common/servicedef/services_test.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_test.xml?rev=1502121&r1=1502120&r2=1502121&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services_test.xml (original)
+++ ofbiz/trunk/framework/common/servicedef/services_test.xml Thu Jul 11
05:38:47 2013
@@ -73,20 +73,20 @@ under the License.
<service name="groupTest" engine="group" location="testGroup" invoke=""/>
<service name="testHttp" engine="http"
- location="http://localhost:8081/webtools/control/httpService";
invoke="testScv">
+ location="http://localhost:8080/webtools/control/httpService";
invoke="testScv">
<description>HTTP service wrapper around the test service</description>
<attribute name="message" type="String" mode="IN" optional="true"/>
<attribute name="resp" type="String" mode="OUT"/>
</service>
<service name="testSoap" engine="soap" export="true"
- location="http://localhost:8081/webtools/control/SOAPService";
invoke="testSOAPScv">
+ location="http://localhost:8080/webtools/control/SOAPService";
invoke="testSOAPScv">
<description>SOAP service; calls the OFBiz test SOAP
service</description>
<implements service="testSOAPScv"/>
</service>
<service name="testSoapSimple" engine="soap" export="true"
- location="http://localhost:8081/webtools/control/SOAPService";
invoke="testScv">
+ location="http://localhost:8080/webtools/control/SOAPService";
invoke="testScv">
<description>simple SOAP service; calls the OFBiz test
service</description>
<implements service="testScv"/>
</service>
Modified: ofbiz/trunk/framework/service/config/serviceengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/serviceengine.xml?rev=1502121&r1=1502120&r2=1502121&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/config/serviceengine.xml (original)
+++ ofbiz/trunk/framework/service/config/serviceengine.xml Thu Jul 11 05:38:47
2013
@@ -60,12 +60,11 @@ under the License.
<engine name="rmi" class="org.ofbiz.service.rmi.RmiServiceEngine"/>
<engine name="soap" class="org.ofbiz.service.engine.SOAPClientEngine"/>
<!-- The engine xml-rpc-local is only used by a test service and for
- this reason it is configured to run on port 8081 (see
test-containers.xml);
- in order to use this in OFBiz change the port accordingly (for
demo the default
- value is 8080)
+ this reason it is configured to run on port 8080 (see
rmi-dispatcher in service/ofbiz-component.xml);
+ in order to use this in OFBiz change the port accordingly (for
demo the default value is 8080)
-->
<engine name="xml-rpc-local"
class="org.ofbiz.service.engine.XMLRPCClientEngine">
- <parameter name="url"
value="http://localhost:8081/webtools/control/xmlrpc"/>
+ <parameter name="url"
value="http://localhost:8080/webtools/control/xmlrpc"/>
<parameter name="login" value="admin"/>
<parameter name="password" value="ofbiz"/>
</engine>
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java?rev=1502121&r1=1502120&r2=1502121&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
(original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
Thu Jul 11 05:38:47 2013
@@ -37,7 +37,7 @@ public class XmlRpcTests extends Abstrac
public static final String module = XmlRpcTests.class.getName();
public static final String resource = "ServiceErrorUiLabels";
- public static final String url =
"http://localhost:8081/webtools/control/xmlrpc";;
+ public static final String url =
"http://localhost:8080/webtools/control/xmlrpc";;
public XmlRpcTests(String name) {
super(name);
