Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 113ECDCF5 for ; Mon, 19 Nov 2012 15:08:44 +0000 (UTC) Received: (qmail 38316 invoked by uid 500); 19 Nov 2012 15:08:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 38215 invoked by uid 500); 19 Nov 2012 15:08:43 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 38203 invoked by uid 99); 19 Nov 2012 15:08:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 15:08:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 15:08:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B58AA23888E3; Mon, 19 Nov 2012 15:08:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121119150821.B58AA23888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ 1.5 - - maven-antrun-plugin - - - copyxmlfiles - generate-sources - - run - - - - - - - - - - - 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 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) {