cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1411234 - in /cxf/branches/2.6.x-fixes: ./ distribution/src/main/release/samples/restful_dispatch/ distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/ distribution/src/main/release/samples/restful_disp...
Date Mon, 19 Nov 2012 15:08:21 GMT
Author: gmazza
Date: Mon Nov 19 15:08:20 2012
New Revision: 1411234

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

........
  r1411230 | gmazza | 2012-11-19 10:04:46 -0500 (Mon, 19 Nov 2012) | 1 line
  
  Removed Maven antrun plugin from restful_dispatch sample (makes it easier to load via m2e)
........

Added:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/resources/
      - copied from r1411230, cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerAllResp.xml
      - copied unchanged from r1411230, cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerAllResp.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnReq.xml
      - copied unchanged from r1411230, cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnReq.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnResp.xml
      - copied unchanged from r1411230, cxf/trunk/distribution/src/main/release/samples/restful_dispatch/src/main/resources/CustomerJohnResp.xml
Removed:
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/CustomerJohnReq.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerAllResp.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/CustomerJohnResp.xml
Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/pom.xml
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java

Propchange: cxf/branches/2.6.x-fixes/
            ('svn:mergeinfo' removed)

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/restful_dispatch/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/pom.xml?rev=1411234&r1=1411233&r2=1411234&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/pom.xml
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/pom.xml
Mon Nov 19 15:08:20 2012
@@ -42,25 +42,6 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copyxmlfiles</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/src/main/java/demo/restful/client/CustomerJohnReq.xml"
todir="${basedir}/target/classes/demo/restful/client" />
-                                <copy file="${basedir}/src/main/java/demo/restful/server/CustomerJohnResp.xml"
todir="${basedir}/target/classes/demo/restful/server" />
-                                <copy file="${basedir}/src/main/java/demo/restful/server/CustomerAllResp.xml"
todir="${basedir}/target/classes/demo/restful/server" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java?rev=1411234&r1=1411233&r2=1411234&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
Mon Nov 19 15:08:20 2012
@@ -83,7 +83,7 @@ public final class Client {
         Map<String, Object> requestContext = dispatcher.getRequestContext();
 
         Client client = new Client();
-        InputStream is = client.getClass().getResourceAsStream("CustomerJohnReq.xml");
+        InputStream is = client.getClass().getResourceAsStream("/CustomerJohnReq.xml");
         Document doc = XMLUtils.parse(is);
         DOMSource reqMsg = new DOMSource(doc);
 

Modified: cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java?rev=1411234&r1=1411233&r2=1411234&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/RestSourcePayloadProvider.java
Mon Nov 19 15:08:20 2012
@@ -74,16 +74,16 @@ public class RestSourcePayloadProvider i
     }
 
     private DOMSource getAllCustomers() {
-        return createDOMSource("CustomerAllResp.xml");
+        return createDOMSource("/CustomerAllResp.xml");
     }
 
     private DOMSource getCustomer(String customerID) {
-        return createDOMSource("CustomerJohnResp.xml");
+        return createDOMSource("/CustomerJohnResp.xml");
     }
 
     private DOMSource updateCustomer(DOMSource request) {
         // TBD: returned update customer info
-        return createDOMSource("CustomerJohnResp.xml");
+        return createDOMSource("/CustomerJohnResp.xml");
     }
 
     private DOMSource createDOMSource(String fileName) {



Mime
View raw message