cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1414786 - in /cxf/trunk/distribution/src/main/release/samples/ws_addressing: ./ src/main/java/demo/ws_addressing/client/ src/main/java/demo/ws_addressing/server/ src/main/resources/ wsdl/
Date Wed, 28 Nov 2012 16:20:42 GMT
Author: gmazza
Date: Wed Nov 28 16:20:41 2012
New Revision: 1414786

URL: http://svn.apache.org/viewvc?rev=1414786&view=rev
Log:
Better Mavenized WS_Addressing sample

Added:
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/resources/
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/resources/client.xml
      - copied unchanged from r1414763, cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/resources/hello_world_addr.wsdl
      - copied unchanged from r1414763, cxf/trunk/distribution/src/main/release/samples/ws_addressing/wsdl/hello_world_addr.wsdl
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/resources/server.xml
      - copied unchanged from r1414763, cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/server.xml
Removed:
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/server.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/wsdl/
Modified:
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
    cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java

Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml?rev=1414786&r1=1414785&r2=1414786&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/pom.xml Wed Nov 28 16:20:41
2012
@@ -32,17 +32,9 @@
 
     <properties>
         <cxf.version>${project.version}</cxf.version>
+        <wsdl.location>${basedir}/src/main/resources/hello_world_addr.wsdl</wsdl.location>
     </properties>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/package.html</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -62,7 +54,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world_addr.wsdl</wsdl>
+                                    <wsdl>${wsdl.location}</wsdl>
                                     <frontEnd>jaxws21</frontEnd>
                                     <faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
@@ -122,7 +114,7 @@
                                 <configuration>
                                     <mainClass>demo.ws_addressing.client.Client</mainClass>
                                     <arguments>
-                                        <argument>${basedir}/wsdl/hello_world_addr.wsdl</argument>
+                                        <argument>${wsdl.location}</argument>
                                         <argument>insecure</argument>
                                     </arguments>
                                 </configuration>
@@ -150,11 +142,6 @@
             <version>2.7.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>2.7.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
         </dependency>

Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java?rev=1414786&r1=1414785&r2=1414786&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
Wed Nov 28 16:20:41 2012
@@ -69,7 +69,7 @@ public final class Client {
             }
 
             SpringBusFactory bf = new SpringBusFactory();
-            URL busFile = Client.class.getResource("client.xml");
+            URL busFile = Client.class.getResource("/client.xml");
             Bus bus = bf.createBus(busFile.toString());
             BusFactory.setDefaultBus(bus);
 

Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java?rev=1414786&r1=1414785&r2=1414786&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
Wed Nov 28 16:20:41 2012
@@ -31,7 +31,7 @@ import org.apache.hello_world_soap_http.
             portName = "SoapPort",
             serviceName = "SOAPService", 
             targetNamespace = "http://apache.org/hello_world_soap_http", 
-            wsdlLocation = "file:./wsdl/hello_world_addr.wsdl")
+            wsdlLocation = "file:./src/main/resources/hello_world_addr.wsdl")
                   
 public class GreeterImpl implements Greeter {
 

Modified: cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java?rev=1414786&r1=1414785&r2=1414786&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
Wed Nov 28 16:20:41 2012
@@ -32,7 +32,7 @@ public class Server {
         System.out.println("Starting Server");
 
         SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = Server.class.getResource("server.xml");
+        URL busFile = Server.class.getResource("/server.xml");
         Bus bus = bf.createBus(busFile.toString());
         BusFactory.setDefaultBus(bus);
 



Mime
View raw message