You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gm...@apache.org on 2012/11/27 15:30:07 UTC
svn commit: r1414204 - in
/cxf/trunk/distribution/src/main/release/samples/ws_rm: ./
src/main/java/demo/ws_rm/client/ src/main/java/demo/ws_rm/server/
src/main/resources/ wsdl/
Author: gmazza
Date: Tue Nov 27 14:30:05 2012
New Revision: 1414204
URL: http://svn.apache.org/viewvc?rev=1414204&view=rev
Log:
Better Mavenized ws_rm project via use of resources folder.
Added:
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
- copied unchanged from r1414154, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/ws_rm.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/hello_world_rm.wsdl
- copied unchanged from r1414154, cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/hello_world_rm.wsdl
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
- copied unchanged from r1414154, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/ws_rm.xml
Removed:
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/ws_rm.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/ws_rm.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/wsdl/
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
Modified: cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml?rev=1414204&r1=1414203&r2=1414204&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/pom.xml Tue Nov 27 14:30:05 2012
@@ -33,15 +33,6 @@
<cxf.version>${project.version}</cxf.version>
</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>
@@ -61,7 +52,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
- <wsdl>${basedir}/wsdl/hello_world_rm.wsdl</wsdl>
+ <wsdl>${basedir}/src/main/resources/hello_world_rm.wsdl</wsdl>
<frontEnd>jaxws21</frontEnd>
<faultSerialVersionUID>1</faultSerialVersionUID>
</wsdlOption>
@@ -146,16 +137,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.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_rm/src/main/java/demo/ws_rm/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java?rev=1414204&r1=1414203&r2=1414204&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java Tue Nov 27 14:30:05 2012
@@ -42,7 +42,7 @@ public final class Client {
try {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = Client.class.getResource("ws_rm.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_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java?rev=1414204&r1=1414203&r2=1414204&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java Tue Nov 27 14:30:05 2012
@@ -25,7 +25,7 @@ import org.apache.cxf.hello_world_soap_h
@javax.jws.WebService(serviceName = "GreeterService",
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.hello_world_soap_http.Greeter",
- wsdlLocation = "file:./wsdl/hello_world_rm.wsdl",
+ wsdlLocation = "file:./src/main/resources/hello_world_rm.wsdl",
targetNamespace = "http://cxf.apache.org/hello_world_soap_http")
public class GreeterImpl implements Greeter {
Modified: cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java?rev=1414204&r1=1414203&r2=1414204&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java Tue Nov 27 14:30:05 2012
@@ -40,7 +40,7 @@ public class Server {
public static void main(String args[]) throws Exception {
SpringBusFactory bf = new SpringBusFactory();
- URL busFile = Server.class.getResource("ws_rm.xml");
+ URL busFile = Server.class.getResource("/server.xml");
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);