Author: jleroux Date: Thu Jul 11 08:12:35 2013 New Revision: 1502145 URL: http://svn.apache.org/r1502145 Log: Finally I backported r1502121, resolving conflicts by hand "Applied fix from trunk for revision: 1502121" ------------------------------------------------------------------------ r1502121 | jleroux | 2013-07-11 07:38:47 +0200 (jeu., 11 juil. 2013) | 3 lines
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/branches/release12.04/ (props changed) ofbiz/branches/release12.04/framework/base/config/test-containers.xml ofbiz/branches/release12.04/framework/common/servicedef/services_test.xml ofbiz/branches/release12.04/framework/service/config/serviceengine.xml ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1502121 Modified: ofbiz/branches/release12.04/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/config/test-containers.xml?rev=1502145&r1=1502144&r2=1502145&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/base/config/test-containers.xml (original) +++ ofbiz/branches/release12.04/framework/base/config/test-containers.xml Thu Jul 11 08:12:35 2013 @@ -163,7 +163,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"/> @@ -201,7 +201,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/branches/release12.04/framework/common/servicedef/services_test.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/servicedef/services_test.xml?rev=1502145&r1=1502144&r2=1502145&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/common/servicedef/services_test.xml (original) +++ ofbiz/branches/release12.04/framework/common/servicedef/services_test.xml Thu Jul 11 08:12:35 2013 @@ -83,20 +83,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/branches/release12.04/framework/service/config/serviceengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/service/config/serviceengine.xml?rev=1502145&r1=1502144&r2=1502145&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/service/config/serviceengine.xml (original) +++ ofbiz/branches/release12.04/framework/service/config/serviceengine.xml Thu Jul 11 08:12:35 2013 @@ -63,12 +63,11 @@ under the License. <engine name="ofbiz-workflow" class="org.ofbiz.workflow.WorkflowEngine"/> <engine name="workflow" class="org.ofbiz.shark.service.SharkServiceEngine"/> <!-- 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/branches/release12.04/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java?rev=1502145&r1=1502144&r2=1502145&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java (original) +++ ofbiz/branches/release12.04/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java Thu Jul 11 08:12:35 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);
