Author: dkulp
Date: Mon Oct 22 14:02:41 2007
New Revision: 587249
URL: http://svn.apache.org/viewvc?rev=587249&view=rev
Log:
Merged revisions 586812 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r586812 | bimargulies | 2007-10-20 18:03:47 -0400 (Sat, 20 Oct 2007) | 1 line
Make sure we actually touch the service that has reuseaddr turned on.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=587249&r1=587248&r2=587249&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
Mon Oct 22 14:02:41 2007
@@ -86,6 +86,11 @@
DummyInterface client = (DummyInterface)
applicationContext.getBean("dummy-client");
assertEquals("We should get out put from this client", "hello world",
client.echo("hello world"));
}
+
+ private void invokeService8801() {
+ DummyInterface client = (DummyInterface)
applicationContext.getBean("dummy-client-8801");
+ assertEquals("We should get out put from this client", "hello world",
client.echo("hello world"));
+ }
private HttpURLConnection getHttpConnection(String target) throws
Exception {
URL url = new URL(target);
@@ -187,13 +192,15 @@
setReuseAddrForServer(8801);
getTestHtml();
- invokeService();
+ invokeService();
+ invokeService8801();
shutdownService();
setUpBus(true);
setReuseAddrForServer(8801);
invokeService();
+ invokeService8801();
getTestHtml();
shutdownService();
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml?rev=587249&r1=587248&r2=587249&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
Mon Oct 22 14:02:41 2007
@@ -45,7 +45,9 @@
<property name="dataBinding" ref="aegisBean" />
</bean>
- <jaxws:endpoint id="dummy-service-endpoint"
implementor="org.apache.cxf.systest.http_jetty.Dummy"
address="http://localhost:8808/Dummy";>
+ <jaxws:endpoint id="dummy-service-endpoint"
+ implementor="org.apache.cxf.systest.http_jetty.Dummy"
+ address="http://localhost:8808/Dummy";>
<jaxws:serviceFactory>
<ref bean='jaxws-and-aegis-service-factory' />
</jaxws:serviceFactory>
@@ -64,6 +66,13 @@
<bean id="clientFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
<property name="serviceClass"
value="org.apache.cxf.systest.http_jetty.DummyInterface" />
<property name="address" value="http://localhost:8808/Dummy"; />
+ </bean>
+
+<bean id="dummy-client-8801"
class="org.apache.cxf.systest.http_jetty.DummyInterface"
factory-bean="clientFactory-8801" factory-method="create" />
+
+ <bean id="clientFactory-8801"
class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
+ <property name="serviceClass"
value="org.apache.cxf.systest.http_jetty.DummyInterface" />
+ <property name="address" value="http://localhost:8801/Dummy"; />
</bean>
</beans>
