cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1406328 - in /cxf/trunk/distribution/src/main/release/samples: wsdl_first/ wsdl_first_dynamic_client/ wsdl_first_dynamic_client/src/main/java/demo/hw/client/ wsdl_first_dynamic_client/src/main/resources/ wsdl_first_dynamic_client/src/main/...
Date Tue, 06 Nov 2012 21:07:59 GMT
Author: dkulp
Date: Tue Nov  6 21:07:59 2012
New Revision: 1406328

URL: http://svn.apache.org/viewvc?rev=1406328&view=rev
Log:
Update wsdl_first_dynamic_client to work well with m2eclipse

Added:
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/wsdl/
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/wsdl/complex.wsdl
      - copied, changed from r1406327, cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/wsdl/complex.wsdl
Removed:
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/wsdl/complex.wsdl
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/wsdl/hello_world.wsdl
Modified:
    cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
    cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java

Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=1406328&r1=1406327&r2=1406328&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first/pom.xml Tue Nov  6 21:07:59
2012
@@ -90,6 +90,8 @@
                             <wsdlOptions>
                                 <wsdlOption>
                                     <wsdl>src/main/resources/CustomerService.wsdl</wsdl>
+                                    <frontEnd>jaxws21</frontEnd>
+                                    <faultSerialVersionUID>1</faultSerialVersionUID>
                                     <bindingFiles>
                                         <bindingFile>src/main/resources/binding.xml</bindingFile>
                                     </bindingFiles>

Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml?rev=1406328&r1=1406327&r2=1406328&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml Tue
Nov  6 21:07:59 2012
@@ -53,7 +53,9 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/complex.wsdl</wsdl>
+                                    <wsdl>${basedir}/src/main/resources/wsdl/complex.wsdl</wsdl>
+                                    <frontEnd>jaxws21</frontEnd>
+                                    <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -63,23 +65,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copywsdlfiles</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/wsdl/complex.wsdl" todir="${basedir}/target/classes/wsdl"
/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -153,12 +138,10 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
-            <version>2.1.12</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.0.6.RELEASE</version>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java?rev=1406328&r1=1406327&r2=1406328&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
Tue Nov  6 21:07:59 2012
@@ -60,7 +60,7 @@ public final class ComplexClient {
         URL wsdlURL;
         File wsdlFile = new File(args[0]);
         if (wsdlFile.exists()) {
-            wsdlURL = wsdlFile.toURL();
+            wsdlURL = wsdlFile.toURI().toURL();
         } else {
             wsdlURL = new URL(args[0]);
         }

Copied: cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/wsdl/complex.wsdl
(from r1406327, cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/wsdl/complex.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/wsdl/complex.wsdl?p2=cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/resources/wsdl/complex.wsdl&p1=cxf/trunk/distribution/src/main/release/samples/wsdl_first_dynamic_client/wsdl/complex.wsdl&r1=1406327&r2=1406328&rev=1406328&view=diff
==============================================================================
    (empty)



Mime
View raw message