cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1411278 - in /cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider: ./ src/main/java/demo/hwDispatch/client/ src/main/java/demo/hwDispatch/server/ src/main/resources/ wsdl/
Date Mon, 19 Nov 2012 16:26:16 GMT
Author: gmazza
Date: Mon Nov 19 16:26:14 2012
New Revision: 1411278

URL: http://svn.apache.org/viewvc?rev=1411278&view=rev
Log:
Updated sample to remove antrun plugin.

Added:
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralReq1.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralReq2.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralReq3.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralResp1.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralResp2.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/GreetMeDocLiteralResp3.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/resources/hello_world.wsdl
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/wsdl/hello_world.wsdl
Removed:
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq2.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/wsdl/
Modified:
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
    cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml?rev=1411278&r1=1411277&r2=1411278&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml Mon Nov
19 16:26:14 2012
@@ -31,6 +31,7 @@
     </parent>
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.file>${basedir}/src/main/resources/hello_world.wsdl</wsdl.file>
     </properties>
     <build>
         <plugins>
@@ -52,7 +53,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                     <extraargs>
                                         <extraarg>-sn</extraarg>
                                         <extraarg>SOAPService1</extraarg>
@@ -70,7 +71,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                     <extraargs>
                                         <extraarg>-sn</extraarg>
                                         <extraarg>SOAPService2</extraarg>
@@ -88,7 +89,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                     <extraargs>
                                         <extraarg>-sn</extraarg>
                                         <extraarg>SOAPService3</extraarg>
@@ -102,7 +103,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!--plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -119,14 +120,11 @@
                                 <copy file="${basedir}/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp1.xml"
todir="${basedir}/target/classes/demo/hwDispatch/server" />
                                 <copy file="${basedir}/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp2.xml"
todir="${basedir}/target/classes/demo/hwDispatch/server" />
                                 <copy file="${basedir}/src/main/java/demo/hwDispatch/server/GreetMeDocLiteralResp3.xml"
todir="${basedir}/target/classes/demo/hwDispatch/server" />
-	    	            
-
-
                             </tasks>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
         </plugins>
     </build>
     <profiles>
@@ -147,7 +145,7 @@
                                 <configuration>
                                     <mainClass>demo.hwDispatch.server.Server</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+                                        <argument>${wsdl.file}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>
@@ -173,7 +171,7 @@
                                 <configuration>
                                     <mainClass>demo.hwDispatch.client.Client</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+                                        <argument>${wsdl.file}</argument>
                                     </arguments>
                                 </configuration>
                             </execution>

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java?rev=1411278&r1=1411277&r2=1411278&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
Mon Nov 19 16:26:14 2012
@@ -64,7 +64,7 @@ public final class Client {
         QName portName1 = new QName("http://apache.org/hello_world_soap_http", "SoapPort1");
 
         SOAPService1 service1 = new SOAPService1(wsdlURL, serviceName1);
-        InputStream is1 =  Client.class.getResourceAsStream("GreetMeDocLiteralReq1.xml");
+        InputStream is1 =  Client.class.getResourceAsStream("/GreetMeDocLiteralReq1.xml");
         if (is1 == null) {
             System.err.println("Failed to create input stream from file "
                                + "GreetMeDocLiteralReq1.xml, please check");
@@ -83,7 +83,7 @@ public final class Client {
         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");
+        InputStream is2 =  Client.class.getResourceAsStream("/GreetMeDocLiteralReq2.xml");
         if (is2 == null) {
             System.err.println("Failed to create input stream from file "
                                + "GreetMeDocLiteralReq2.xml, please check");
@@ -104,7 +104,7 @@ public final class Client {
         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");
+        InputStream is3 =  Client.class.getResourceAsStream("/GreetMeDocLiteralReq3.xml");
         if (is3 == null) {
             System.err.println("Failed to create input stream from file "
                                + "GreetMeDocLiteralReq3.xml, please check");

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java?rev=1411278&r1=1411277&r2=1411278&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
Mon Nov 19 16:26:14 2012
@@ -47,7 +47,7 @@ public class GreeterDOMSourceMessageProv
             soapReq.writeTo(System.out);
             System.out.println("\n");
     
-            InputStream is = getClass().getResourceAsStream("GreetMeDocLiteralResp2.xml");
+            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp2.xml");
             SOAPMessage greetMeResponse =  factory.createMessage(null, is);
             is.close();
 

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java?rev=1411278&r1=1411277&r2=1411278&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
Mon Nov 19 16:26:14 2012
@@ -46,7 +46,7 @@ public class GreeterDOMSourcePayloadProv
             transformer.transform(request, result);
             System.out.println("\n");
             
-            InputStream is = getClass().getResourceAsStream("GreetMeDocLiteralResp3.xml");
+            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp3.xml");
             
             SOAPMessage greetMeResponse =  MessageFactory.newInstance().createMessage(null,
is);
             is.close();            

Modified: cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java?rev=1411278&r1=1411277&r2=1411278&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
Mon Nov 19 16:26:14 2012
@@ -29,7 +29,7 @@ import javax.xml.ws.WebServiceProvider;
 
 @WebServiceProvider(portName = "SoapPort1", serviceName = "SOAPService1",
                       targetNamespace = "http://apache.org/hello_world_soap_http",
-                      wsdlLocation = "wsdl/hello_world.wsdl")
+                      wsdlLocation = "/hello_world.wsdl")
 @ServiceMode(value = Service.Mode.MESSAGE)
 public class GreeterSoapMessageProvider implements Provider<SOAPMessage> {
 
@@ -42,7 +42,7 @@ public class GreeterSoapMessageProvider 
         try {
             System.out.println("Incoming Client Request as a SOAPMessage");
             MessageFactory factory = MessageFactory.newInstance();
-            InputStream is = getClass().getResourceAsStream("GreetMeDocLiteralResp1.xml");
+            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp1.xml");
             response =  factory.createMessage(null, is);
             is.close();
         } catch (Exception ex) {



Mime
View raw message