Author: gmazza
Date: Wed Nov 28 16:12:18 2012
New Revision: 1414781
URL: http://svn.apache.org/viewvc?rev=1414781&view=rev
Log:
Merged revisions 1414780 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414780 | gmazza | 2012-11-28 11:08:07 -0500 (Wed, 28 Nov 2012) | 1 line
Better Mavenized WS_Policy sample
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml
- copied unchanged from r1414780,
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/client.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/hello_world_addr_policy.wsdl
- copied unchanged from r1414780,
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/hello_world_addr_policy.wsdl
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml
- copied unchanged from r1414780,
cxf/trunk/distribution/src/main/release/samples/ws_policy/src/main/resources/server.xml
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/client.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/server.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/wsdl/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml?rev=1414781&r1=1414780&r2=1414781&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/pom.xml
Wed Nov 28 16:12:18 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.6.4-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>2.6.4-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java?rev=1414781&r1=1414780&r2=1414781&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
Wed Nov 28 16:12:18 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/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java?rev=1414781&r1=1414780&r2=1414781&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
Wed Nov 28 16:12:18 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);
