Get the tools/wsdlto/test tests to behave identically inside and outside of
eclipse
Conflicts:
tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/900e9ad9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/900e9ad9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/900e9ad9
Branch: refs/heads/2.7.x-fixes
Commit: 900e9ad9ace305bfa939b63e7a10c436e2e0cd9b
Parents: d501a77
Author: Daniel Kulp <[email protected]>
Authored: Fri May 9 14:33:13 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Tue May 13 15:05:05 2014 -0400
----------------------------------------------------------------------
tools/wsdlto/test/pom.xml | 6 ++++++
.../java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 2 +-
.../tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java | 2 +-
.../test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl | 5 ++---
4 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/900e9ad9/tools/wsdlto/test/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wsdlto/test/pom.xml b/tools/wsdlto/test/pom.xml
index dd5bd19..0414f3d 100644
--- a/tools/wsdlto/test/pom.xml
+++ b/tools/wsdlto/test/pom.xml
@@ -103,6 +103,12 @@
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-xmlbeans</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/900e9ad9/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
----------------------------------------------------------------------
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
index 696ac5a..cb900a1 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
@@ -1172,7 +1172,7 @@ public class CodeGenTest extends AbstractCodeGenTest {
// to figure out which parts are headers and which are
body for rpc/lit
processor.setContext(env);
processor.execute();
- Class<?> cls =
classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeader");
+ Class<?> cls =
classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeaderPort");
Method meths[] = cls.getMethods();
for (Method m : meths) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/900e9ad9/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
----------------------------------------------------------------------
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
index d33a3db..7c14208 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
@@ -20,13 +20,13 @@
package org.apache.cxf.tools.wsdlto.jaxws.wsdl11;
import java.util.Map;
+
import javax.wsdl.Binding;
import javax.wsdl.BindingInput;
import javax.wsdl.BindingOperation;
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.Service;
-import javax.wsdl.extensions.http.HTTPAddress;
import javax.xml.namespace.QName;
import org.apache.cxf.BusFactory;
http://git-wip-us.apache.org/repos/asf/cxf/blob/900e9ad9/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
----------------------------------------------------------------------
diff --git
a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
index 3a28256..d86e025 100644
--- a/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
+++ b/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/soapheader_rpc.wsdl
@@ -45,8 +45,7 @@
<wsdl:part name="out" type="xsd:string"/>
<wsdl:part name="inOutHeader" element="x1:headerMessage"/>
</wsdl:message>
-
- <wsdl:portType name="TestRPCHeader">
+ <wsdl:portType name="TestRPCHeaderPort">
<wsdl:operation name="testHeader1">
<wsdl:input name="testHeader1Request"
message="tns:testHeader1Request"/>
<wsdl:output name="testHeader1Response"
message="tns:testHeader1Response"/>
@@ -56,7 +55,7 @@
<wsdl:output name="testInOutHeaderResponse"
message="tns:testInOutHeaderResponse"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="TestHeader_SOAPRPCBinding" type="tns:TestRPCHeader">
+ <wsdl:binding name="TestHeader_SOAPRPCBinding"
type="tns:TestRPCHeaderPort">
<soap:binding style="rpc"
transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="testHeader1">
<soap:operation/>
