Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 53473 invoked from network); 5 May 2010 07:52:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 May 2010 07:52:14 -0000 Received: (qmail 90324 invoked by uid 500); 5 May 2010 07:52:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 90218 invoked by uid 500); 5 May 2010 07:52:12 -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 90211 invoked by uid 99); 5 May 2010 07:52:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 07:52:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 05 May 2010 07:52:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB777238897A; Wed, 5 May 2010 07:51:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r941188 - in /cxf/branches/2.2.x-fixes: ./ distribution/src/main/release/samples/wsdl_first/ distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/ distribution/src/main/release/samples/wsdl_first... Date: Wed, 05 May 2010 07:51:17 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100505075117.EB777238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Wed May 5 07:51:17 2010 New Revision: 941188 URL: http://svn.apache.org/viewvc?rev=941188&view=rev Log: Merged revisions 941187 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r941187 | ffang | 2010-05-05 15:37:34 +0800 (三, 05 5 2010) | 1 line [CXF-2799]ant client-servlet doesn't work for wsdl-first demo anymore ........ Added: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml - copied unchanged from r941187, cxf/trunk/distribution/src/main/release/samples/wsdl_first/wsdl/cxf-servlet.xml Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/build.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/build.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/build.xml?rev=941188&r1=941187&r2=941188&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/build.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/build.xml Wed May 5 07:51:17 2010 @@ -51,6 +51,6 @@ - + Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java?rev=941188&r1=941187&r2=941188&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java Wed May 5 07:51:17 2010 @@ -18,6 +18,9 @@ */ package com.example.customerservice.client; +import java.io.File; +import java.net.URL; + import com.example.customerservice.CustomerService; import com.example.customerservice.CustomerServiceService; import com.example.customerservice.NoSuchCustomerException; @@ -26,9 +29,23 @@ public class CustomerServiceClient { protected CustomerServiceClient() { } - public static void main(String args[]) throws NoSuchCustomerException { - // Create the service client with its default wsdlurl - CustomerServiceService customerServiceService = new CustomerServiceService(); + public static void main(String args[]) throws Exception { + CustomerServiceService customerServiceService; + if (args.length != 0 && args[0].length() != 0) { + File wsdlFile = new File(args[0]); + URL wsdlURL; + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURL(); + } else { + wsdlURL = new URL(args[0]); + } + // Create the service client with specified wsdlurl + customerServiceService = new CustomerServiceService(wsdlURL); + } else { + // Create the service client with its default wsdlurl + customerServiceService = new CustomerServiceService(); + } + CustomerService customerService = customerServiceService.getCustomerServicePort(); // Initialize the test class and call the tests