Author: ffang
Date: Sun May 31 10:11:42 2009
New Revision: 780400
URL: http://svn.apache.org/viewvc?rev=780400&view=rev
Log:
[SMX4-294]refactor tests to not use port 9000 so that the tests can pass with
sonar on same machine
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/CxfMessageTest.java
Sun May 31 10:11:42 2009
@@ -58,7 +58,7 @@
protected void startService() {
Object implementor = new PersonImpl();
- String address = "http://localhost:9000/PersonService/";;
+ String address = "http://localhost:19000/PersonService/";;
Endpoint.publish(address, implementor);
}
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/ExceptionHandleTest.java
Sun May 31 10:11:42 2009
@@ -21,6 +21,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
+import javax.xml.ws.soap.SOAPBinding;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
@@ -44,7 +45,7 @@
public class ExceptionHandleTest extends ContextTestSupport {
- protected static final String ROUTER_ADDRESS =
"camel://jetty:http://localhost:9000/SoapContext/SoapPort";;
+ protected static final String ROUTER_ADDRESS =
"camel://jetty:http://localhost:19000/SoapContext/SoapPort";;
protected static final String SERVICE_ADDRESS = "local://smx/hello_world";
protected static final String SERVICE_CLASS =
"serviceClass=org.apache.hello_world_soap_http.Greeter";
private static final String WSDL_LOCATION =
"wsdlURL=/wsdl/hello_world.wsdl";
@@ -114,7 +115,10 @@
assertNotNull(wsdl);
SOAPService service1 = new SOAPService(wsdl, new QName(
"http://apache.org/hello_world_soap_http";, "SOAPService"));
- Greeter greeter = service1.getSoapPort();
+ QName endpoint = new QName("http://apache.org/hello_world_soap_http";,
"SoapPort");
+ service1.addPort(endpoint,
+ SOAPBinding.SOAP12HTTP_BINDING,
"http://localhost:19000/SoapContext/SoapPort";);
+ Greeter greeter = service1.getPort(endpoint, Greeter.class);
ClientProxy.getClient(greeter).getInInterceptors().add(new
LoggingInInterceptor());
ClientProxy.getClient(greeter).getOutInterceptors().add(new
LoggingOutInterceptor());
String ret = greeter.sayHi();
@@ -150,7 +154,10 @@
assertNotNull(wsdl);
SOAPService service1 = new SOAPService(wsdl, new QName(
"http://apache.org/hello_world_soap_http";, "SOAPService"));
- Greeter greeter = service1.getSoapPort();
+ QName endpoint = new QName("http://apache.org/hello_world_soap_http";,
"SoapPort");
+ service1.addPort(endpoint,
+ SOAPBinding.SOAP12HTTP_BINDING,
"http://localhost:19000/SoapContext/SoapPort";);
+ Greeter greeter = service1.getPort(endpoint, Greeter.class);
ClientProxy.getClient(greeter).getInInterceptors().add(new
LoggingInInterceptor());
ClientProxy.getClient(greeter).getOutInterceptors().add(new
LoggingOutInterceptor());
greeter.greetMeOneWay("test oneway");
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/nmr/SmxToCxfTest.java
Sun May 31 10:11:42 2009
@@ -30,7 +30,7 @@
public class SmxToCxfTest extends SpringTestSupport {
- protected static final String ROUTER_ADDRESS =
"http://localhost:9000/router";;
+ protected static final String ROUTER_ADDRESS =
"http://localhost:19000/router";;
protected static final String SERVICE_ADDRESS = "local://smx/helloworld";
protected static final String SERVICE_CLASS =
"serviceClass=org.apache.servicemix.camel.nmr.HelloService";
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/CxfMessageBeans.xml
Sun May 31 10:11:42 2009
@@ -33,7 +33,7 @@
xmlns:person="http://servicemix.apache.org/samples/wsdl-first"/>
- <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:9000/PersonService/";
+ <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:19000/PersonService/";
serviceClass="org.apache.servicemix.samples.wsdl_first.Person"
endpointName="person:soap"
serviceName="person:PersonService"
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/spring/EndpointBeans.xml
Sun May 31 10:11:42 2009
@@ -26,7 +26,7 @@
">
- <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router";
+ <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:19000/router";
serviceClass="org.apache.servicemix.camel.nmr.HelloService">
<cxf:properties>
<entry key="setDefaultBus" value="true"/>
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/addressing/hello_world.wsdl
Sun May 31 10:11:42 2009
@@ -340,7 +340,7 @@
<wsdl:service name="SOAPService">
<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
- <soap:address
location="http://localhost:9000/SoapContext/SoapPort"/>
+ <soap:address
location="http://localhost:19000/SoapContext/SoapPort"/>
</wsdl:port>
<wsdl:port name="SoapPort1" binding="tns:Greeter_SOAPBinding">
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world.wsdl
Sun May 31 10:11:42 2009
@@ -35,7 +35,7 @@
<wsdl:port
name="TimestampSignEncrypt"
binding="tns:Greeter_SOAPBinding">
- <soap:address
location="http://localhost:9000/SOAPServiceWSSecurity/TimestampSignEncrypt"/>
+ <soap:address
location="http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncrypt"/>
</wsdl:port>
</wsdl:service>
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/hello_world_base.wsdl
Sun May 31 10:11:42 2009
@@ -340,7 +340,7 @@
<wsdl:service name="SOAPService">
<wsdl:port name="SoapPort" binding="tns:Greeter_SOAPBinding">
- <soap:address
location="http://localhost:9000/SoapContext/SoapPort"/>
+ <soap:address
location="http://localhost:19000/SoapContext/SoapPort"/>
</wsdl:port>
<wsdl:port name="SoapPort1" binding="tns:Greeter_SOAPBinding">
Modified:
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml?rev=780400&r1=780399&r2=780400&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
(original)
+++
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/resources/org/apache/servicemix/camel/ws/security/server.xml
Sun May 31 10:11:42 2009
@@ -36,7 +36,7 @@
</camelContext>
</camel:destination>
- <cxf:cxfEndpoint id="routerEndpoint" name="test:TimestampSignEncrypt"
address="camel://jetty:http://localhost:9000/SOAPServiceWSSecurity/TimestampSignEncrypt";
serviceClass="org.apache.hello_world_soap_http.Greeter">
+ <cxf:cxfEndpoint id="routerEndpoint" name="test:TimestampSignEncrypt"
address="camel://jetty:http://localhost:19000/SOAPServiceWSSecurity/TimestampSignEncrypt";
serviceClass="org.apache.hello_world_soap_http.Greeter">
<cxf:features>
<bean class="org.apache.cxf.feature.LoggingFeature"/>
</cxf:features>
