svn commit: r1414780 - in /cxf/trunk/distribution/src/main/release/samples/ws_policy: ./ src/main/java/demo/ws_policy/client/ src/main/java/demo/ws_policy/server/ src/main/resources/ wsdl/

[gmazza]

Author: gmazza
Date: Wed Nov 28 16:08:07 2012
New Revision: 1414780

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

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

Modified: cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml?rev=1414780&r1=1414779&r2=1414780&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_policy/pom.xml Wed Nov 
28 16:08:07 2012
@@ -34,18 +34,6 @@
         <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/package.html</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -65,7 +53,7 @@
                         <configuration>
                             <wsdlOptions>
                                 <wsdlOption>
-                                    
<wsdl>${basedir}/wsdl/hello_world_addr_policy.wsdl</wsdl>
+                                    
<wsdl>${basedir}/src/main/resources/hello_world_addr_policy.wsdl</wsdl>
                                                                        
<frontEnd>jaxws21</frontEnd>
                                                                        
<faultSerialVersionUID>1</faultSerialVersionUID>
                                 </wsdlOption>
@@ -149,11 +137,6 @@
             <version>2.7.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</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_policy/src/main/java/demo/ws_policy/client/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java?rev=1414780&r1=1414779&r2=1414780&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
 Wed Nov 28 16:08:07 2012
@@ -39,7 +39,7 @@ public final class Client {
         try {
 
             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_policy/src/main/java/demo/ws_policy/server/Server.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java?rev=1414780&r1=1414779&r2=1414780&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
 Wed Nov 28 16:08:07 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);