cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1414208 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/ws_rm/ distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/ distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/serve...
Date Tue, 27 Nov 2012 14:37:09 GMT
Author: gmazza
Date: Tue Nov 27 14:37:07 2012
New Revision: 1414208

URL: http://svn.apache.org/viewvc?rev=1414208&view=rev
Log:
Merged revisions 1414204 via  svn merge from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1414204 | gmazza | 2012-11-27 09:30:05 -0500 (Tue, 27 Nov 2012) | 1 line
  
  Better Mavenized ws_rm project via use of resources folder.
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/resources/
      - copied from r1414204, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
      - copied unchanged from r1414204, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/client.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/resources/hello_world_rm.wsdl
      - copied unchanged from r1414204, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/hello_world_rm.wsdl
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
      - copied unchanged from r1414204, cxf/trunk/distribution/src/main/release/samples/ws_rm/src/main/resources/server.xml
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/ws_rm.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/ws_rm.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/wsdl/
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/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_rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/pom.xml?rev=1414208&r1=1414207&r2=1414208&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/pom.xml Tue Nov 27
14:37:07 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.6.4-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-addr</artifactId>
-            <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_rm/src/main/java/demo/ws_rm/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java?rev=1414208&r1=1414207&r2=1414208&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
Tue Nov 27 14:37:07 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/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java?rev=1414208&r1=1414207&r2=1414208&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
Tue Nov 27 14:37:07 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/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java?rev=1414208&r1=1414207&r2=1414208&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
Tue Nov 27 14:37:07 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);



Mime
View raw message