cxf-commits mailing list archives

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

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

Added:
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/GreetMeDocLiteralReq1.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/GreetMeDocLiteralReq2.xml
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/hello_world.wsdl
      - copied unchanged from r1411269, cxf/trunk/distribution/src/main/release/samples/js_provider/wsdl/hello_world.wsdl
Removed:
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml
    cxf/trunk/distribution/src/main/release/samples/js_provider/wsdl/
Modified:
    cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
    cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx

Modified: cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml?rev=1411338&r1=1411337&r2=1411338&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/js_provider/pom.xml Mon Nov 19 18:09:15
2012
@@ -32,6 +32,7 @@
     <properties>
         <cxf.version>${project.version}</cxf.version>
         <cxf.release.base>${basedir}/../..</cxf.release.base>
+        <wsdl.file>${basedir}/src/main/resources/hello_world.wsdl</wsdl.file>
     </properties>
     <build>
         <defaultGoal>install</defaultGoal>
@@ -56,24 +57,6 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prepare-transform</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq1.xml"
todir="${basedir}/target/classes/demo/hwDispatch/client" />
-                                <copy file="${basedir}/src/main/java/demo/hwDispatch/client/GreetMeDocLiteralReq3.xml"
todir="${basedir}/target/classes/demo/hwDispatch/client" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
                 <version>${project.version}</version>
@@ -84,7 +67,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                    <wsdl>${wsdl.file}</wsdl>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -144,7 +127,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/js_provider/src/main/java/demo/hwDispatch/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java?rev=1411338&r1=1411337&r2=1411338&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
Mon Nov 19 18:09:15 2012
@@ -48,7 +48,7 @@ public final class Client {
         URL wsdlURL;
         File wsdlFile = new File(args[0]);
         if (wsdlFile.exists()) {
-            wsdlURL = wsdlFile.toURL();
+            wsdlURL = wsdlFile.toURI().toURL();
         } else {
             wsdlURL = new URL(args[0]);
         }
@@ -61,7 +61,7 @@ public final class Client {
         QName portName1 = new QName(ns, "SoapPort1");
 
         SOAPService1 service1 = new SOAPService1(wsdlURL, serviceName1);
-        InputStream is1 =  Client.class.getResourceAsStream("GreetMeDocLiteralReq1.xml");
+        InputStream is1 =  Client.class.getResourceAsStream("/GreetMeDocLiteralReq1.xml");
         SOAPMessage soapReq1 = factory.createMessage(null, is1);
 
         Dispatch<SOAPMessage> dispSOAPMsg = service1.createDispatch(portName1,
@@ -75,7 +75,7 @@ public final class Client {
         QName portName3 = new QName(ns, "SoapPort3");
 
         SOAPService3 service3 = new SOAPService3(wsdlURL, serviceName3);
-        InputStream is3 =  Client.class.getResourceAsStream("GreetMeDocLiteralReq3.xml");
+        InputStream is3 =  Client.class.getResourceAsStream("/GreetMeDocLiteralReq2.xml");
         SOAPMessage soapReq3 = MessageFactory.newInstance().createMessage(null, is3);
         DOMSource domReqPayload = new DOMSource(soapReq3.getSOAPBody().extractContentAsDocument());
 

Modified: cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js?rev=1411338&r1=1411337&r2=1411338&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
(original)
+++ cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.js
Mon Nov 19 18:09:15 2012
@@ -18,7 +18,7 @@
  */
 
 var WebServiceProvider = {
-    "wsdlLocation": "file:./wsdl/hello_world.wsdl",
+    "wsdlLocation": "file:./src/main/resources/hello_world.wsdl",
     "serviceName": "SOAPService3",
     "portName": "SoapPort3",
     "targetNamespace": "http://apache.org/hello_world_soap_http",

Modified: cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx?rev=1411338&r1=1411337&r2=1411338&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx
(original)
+++ cxf/trunk/distribution/src/main/release/samples/js_provider/src/main/resources/impl.jsx
Mon Nov 19 18:09:15 2012
@@ -18,7 +18,7 @@
  */
 
 var WebServiceProvider1 = {
-    'wsdlLocation': 'file:./wsdl/hello_world.wsdl',
+    'wsdlLocation': 'file:./src/main/resources/hello_world.wsdl',
     'serviceName': 'SOAPService1',
     'portName': 'SoapPort1',
     'targetNamespace': 'http://apache.org/hello_world_soap_http',



Mime
View raw message