Author: dkulp
Date: Thu Dec 16 19:19:16 2010
New Revision: 1050106
URL: http://svn.apache.org/viewvc?rev=1050106&view=rev
Log:
Merged revisions 1050102 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1050102 | dkulp | 2010-12-16 14:14:35 -0500 (Thu, 16 Dec 2010) | 2 lines
Missed a non-dynamic port. Try with both jaxws:endpoint and the
ServerFactoryBean
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 16 19:19:16 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049937,1050005,1050021,1050095,1050102
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java?rev=1050106&r1=1050105&r2=1050106&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/Cxf1332Test.java
Thu Dec 16 19:19:16 2010
@@ -19,13 +19,18 @@
package org.apache.cxf.cxf1332;
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.test.AbstractCXFSpringTest;
+import org.apache.cxf.testutil.common.TestUtil;
+
import org.junit.Test;
/**
*
*/
public class Cxf1332Test extends AbstractCXFSpringTest {
+ public static final String PORT =
TestUtil.getPortNumber(Cxf1332Test.class);
+ public static final String PORT2 =
TestUtil.getPortNumber(Cxf1332Test.class, 2);
/**
* @throws Exception
@@ -35,6 +40,9 @@ public class Cxf1332Test extends Abstrac
@Test
public void tryToSendStringArray() throws Exception {
+ JaxWsServerFactoryBean server = getBean(JaxWsServerFactoryBean.class,
"ServiceFactory");
+ server.create();
+
Cxf1332 client = getBean(Cxf1332.class, "client");
String[] a = new String[] {"a", "b", "c"};
client.hostSendData(a);
Modified:
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml?rev=1050106&r1=1050105&r2=1050106&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
(original)
+++
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf1332/beans.xml
Thu Dec 16 19:19:16 2010
@@ -25,11 +25,13 @@ xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
-<import resource="classpath:META-INF/cxf/cxf.xml" />
-<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-<import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<bean id="logInbound"
class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
<bean id="logOutbound"
class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
@@ -38,16 +40,24 @@ http://cxf.apache.org/jaxws http://cxf.a
<cxf:outInterceptors> <ref bean="logOutbound"/> </cxf:outInterceptors>
<cxf:inFaultInterceptors> <ref bean="logOutbound"/>
</cxf:inFaultInterceptors>
</cxf:bus>
- <jaxws:endpoint id="cxf1332"
implementor="org.apache.cxf.cxf1332.Cxf1332Impl"
- address="http://localhost:8088/Cxf1332"; />
+
+ <bean id="ServiceImpl" class="org.apache.cxf.cxf1332.Cxf1332Impl"/>
+ <jaxws:endpoint id="cxf1332" implementor="#ServiceImpl"
+
address="http://localhost:${testutil.ports.Cxf1332Test}/Cxf1332"; />
+
+ <bean id="ServiceFactory"
class="org.apache.cxf.jaxws.JaxWsServerFactoryBean">
+ <property name="serviceBean" ref="ServiceImpl" />
+ <property name="start" value="true" />
+ <property name="address"
value="http://localhost:${testutil.ports.Cxf1332Test.2}/Cxf1332"/>
+ </bean>
+
<bean id="proxyFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
<property name="serviceClass" value="org.apache.cxf.cxf1332.Cxf1332"/>
- <property name="address" value="http://localhost:8088/Cxf1332"/>
- </bean>
+ <property name="address"
value="http://localhost:${testutil.ports.Cxf1332Test}/Cxf1332"/>
+ </bean>
- <bean id="client" class="org.apache.cxf.cxf1332.Cxf1332"
- factory-bean="proxyFactory" factory-method="create"/>
-
+ <bean id="client" class="org.apache.cxf.cxf1332.Cxf1332"
+ factory-bean="proxyFactory" factory-method="create"/>
</beans>
