You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/10/29 20:58:03 UTC
svn commit: r1536872 - in /cxf/branches/2.7.x-fixes:
distribution/src/main/release/samples/jaxws_dispatch_provider/
distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/
distribution/src/main/release/sample...
Author: dkulp
Date: Tue Oct 29 19:58:02 2013
New Revision: 1536872
URL: http://svn.apache.org/r1536872
Log:
Fix compile failure
Modified:
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml?rev=1536872&r1=1536871&r2=1536872&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml Tue Oct 29 19:58:02 2013
@@ -31,7 +31,9 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <wsdl.file>${basedir}/src/main/resources/hello_world.wsdl</wsdl.file>
+ <wsdl.file>${basedir}/src/main/resources/NewWSDLFile.wsdl</wsdl.file>
+ <wsdl.spring.file>${basedir}/src/main/resources/NewWSDLFileSpring.wsdl</wsdl.spring.file>
+ <cxf.xjc-utils.version>2.6.0</cxf.xjc-utils.version>
</properties>
<build>
<plugins>
@@ -119,23 +121,64 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>clientspring</id>
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ <mainClass>demo.hwDispatch.client.Client</mainClass>
+ <arguments>
+ <argument>${wsdl.spring.file}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>2.7.8-SNAPSHOT</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>2.7.8-SNAPSHOT</version>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>3.2.4.RELEASE</version>
+ </dependency>
<!-- Jetty is needed if you're using the CXFServlet -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>2.7.8-SNAPSHOT</version>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-wstx-msv-validation</artifactId>
+ <version>${cxf.version}</version>
</dependency>
</dependencies>
</project>
Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java?rev=1536872&r1=1536871&r2=1536872&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java (original)
+++ cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java Tue Oct 29 19:58:02 2013
@@ -33,9 +33,7 @@ import javax.xml.ws.Service.Mode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.hello_world_soap_http.SOAPService1;
-import org.apache.hello_world_soap_http.SOAPService2;
-import org.apache.hello_world_soap_http.SOAPService3;
+import org.example.newwsdlfile.NewWSDLFile_Service;
public final class Client {
@@ -60,14 +58,14 @@ public final class Client {
MessageFactory factory = MessageFactory.newInstance();
System.out.println(wsdlURL + "\n\n");
- QName serviceName1 = new QName("http://apache.org/hello_world_soap_http", "SOAPService1");
- QName portName1 = new QName("http://apache.org/hello_world_soap_http", "SoapPort1");
+ QName serviceName1 = new QName("http://www.example.org/NewWSDLFile/", "NewWSDLFile");
+ QName portName1 = new QName("http://www.example.org/NewWSDLFile/", "NewWSDLFileSOAP");
- SOAPService1 service1 = new SOAPService1(wsdlURL, serviceName1);
- InputStream is1 = Client.class.getResourceAsStream("/GreetMeDocLiteralReq1.xml");
+ NewWSDLFile_Service service1 = new NewWSDLFile_Service(wsdlURL, serviceName1);
+ InputStream is1 = Client.class.getResourceAsStream("/NoteDocLiteralReq.xml");
if (is1 == null) {
System.err.println("Failed to create input stream from file "
- + "GreetMeDocLiteralReq1.xml, please check");
+ + "NoteDocLiteralReq.xml, please check");
System.exit(-1);
}
SOAPMessage soapReq1 = factory.createMessage(null, is1);
@@ -79,49 +77,21 @@ public final class Client {
SOAPMessage soapResp = dispSOAPMsg.invoke(soapReq1);
System.out.println("Response from server: " + soapResp.getSOAPBody().getTextContent());
- QName serviceName2 = new QName("http://apache.org/hello_world_soap_http", "SOAPService2");
- QName portName2 = new QName("http://apache.org/hello_world_soap_http", "SoapPort2");
-
- SOAPService2 service2 = new SOAPService2(wsdlURL, serviceName2);
- InputStream is2 = Client.class.getResourceAsStream("/GreetMeDocLiteralReq2.xml");
+ NewWSDLFile_Service service2 = new NewWSDLFile_Service(wsdlURL, serviceName1);
+ InputStream is2 = Client.class.getResourceAsStream("/NoteDocLiteralReq_doesnt_match_schema.xml");
if (is2 == null) {
System.err.println("Failed to create input stream from file "
- + "GreetMeDocLiteralReq2.xml, please check");
+ + "NoteDocLiteralReq_doesnt_match_schema.xml, please check");
System.exit(-1);
}
SOAPMessage soapReq2 = factory.createMessage(null, is2);
- DOMSource domReqMessage = new DOMSource(soapReq2.getSOAPPart());
- Dispatch<DOMSource> dispDOMSrcMessage = service2.createDispatch(portName2,
- DOMSource.class, Mode.MESSAGE);
- System.out.println("Invoking server through Dispatch interface using DOMSource in MESSAGE Mode");
- DOMSource domRespMessage = dispDOMSrcMessage.invoke(domReqMessage);
- System.out.println("Response from server: "
- + domRespMessage.getNode().getLastChild().getTextContent());
-
-
- QName serviceName3 = new QName("http://apache.org/hello_world_soap_http", "SOAPService3");
- QName portName3 = new QName("http://apache.org/hello_world_soap_http", "SoapPort3");
-
- SOAPService3 service3 = new SOAPService3(wsdlURL, serviceName3);
- InputStream is3 = Client.class.getResourceAsStream("/GreetMeDocLiteralReq3.xml");
- if (is3 == null) {
- System.err.println("Failed to create input stream from file "
- + "GreetMeDocLiteralReq3.xml, please check");
- System.exit(-1);
- }
-
- SOAPMessage soapReq3 = MessageFactory.newInstance().createMessage(null, is3);
- DOMSource domReqPayload = new DOMSource(soapReq3.getSOAPBody().extractContentAsDocument());
+ Dispatch<SOAPMessage> dispSOAPMsg2 = service2.createDispatch(portName1,
+ SOAPMessage.class, Mode.MESSAGE);
- Dispatch<DOMSource> dispDOMSrcPayload = service3.createDispatch(portName3,
- DOMSource.class, Mode.PAYLOAD);
- System.out.println("Invoking server through Dispatch interface using DOMSource in PAYLOAD Mode");
- DOMSource domRespPayload = dispDOMSrcPayload.invoke(domReqPayload);
-
- System.out.println("Response from server: "
- + fetchElementByName(domRespPayload.getNode(),
- "greetMeResponse").getTextContent());
+ System.out.println("Invoking server through Dispatch interface using SOAPMessage");
+ SOAPMessage soapResp2 = dispSOAPMsg2.invoke(soapReq2);
+ System.out.println("Response from server: " + soapResp2.getSOAPBody().getTextContent());
System.exit(0);
}
Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java?rev=1536872&r1=1536871&r2=1536872&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java (original)
+++ cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java Tue Oct 29 19:58:02 2013
@@ -19,26 +19,27 @@
package demo.hwDispatch.server;
import javax.xml.ws.Endpoint;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.ws.addressing.WSAddressingFeature;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
public class Server {
protected Server() throws Exception {
System.out.println("Starting Server");
- System.out.println("Starting SoapService1");
- Object implementor = new GreeterSoapMessageProvider();
- String address = "http://localhost:9000/SoapContext/SoapPort1";
- Endpoint.publish(address, implementor);
-
- System.out.println("Starting SoapService2");
- implementor = new GreeterDOMSourceMessageProvider();
- address = "http://localhost:9000/SoapContext/SoapPort2";
- Endpoint.publish(address, implementor);
-
- System.out.println("Starting SoapService3");
- implementor = new GreeterDOMSourcePayloadProvider();
- address = "http://localhost:9000/SoapContext/SoapPort3";
- Endpoint.publish(address, implementor);
+ System.out.println("Starting NewWSDLFile service");
+ Object implementor = new NewWSDLFileSoapMessageProvider();
+ String address = "http://localhost:9000/SoapContext/NewWSDLFileSOAP";
+ //EndpointImpl ep = (EndpointImpl)Endpoint.publish(address, implementor);
+ //ep.getFeatures().add(new WSAddressingFeature());
+ EndpointImpl ep = (EndpointImpl)Endpoint.create(implementor);
+ ep.getProperties().put("schema-validation-enabled","true");
+ ep.publish(address);
+
+ // also start a second server using Spring
+ new ClassPathXmlApplicationContext("server-applicationContext.xml");
+ System.in.read();
}
public static void main(String args[]) throws Exception {
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1536872&r1=1536871&r2=1536872&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Tue Oct 29 19:58:02 2013
@@ -220,7 +220,8 @@ public class XMLStreamDataReader impleme
if (svm != null) {
//filter xop node
XMLStreamWriter nullWriter = StaxUtils.createXMLStreamWriter(new NUllOutputStream());
- if (svm.setupValidation(nullWriter, message.getExchange().getService().getServiceInfos().get(0))) {
+ if (svm.setupValidation(nullWriter, message.getExchange().getEndpoint(),
+ message.getExchange().getService().getServiceInfos().get(0))) {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(ds);
XMLStreamReader filteredReader =
StaxUtils.createFilteredReader(reader,