Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 76201 invoked from network); 9 Dec 2010 23:43:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Dec 2010 23:43:51 -0000 Received: (qmail 31768 invoked by uid 500); 9 Dec 2010 23:43:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31720 invoked by uid 500); 9 Dec 2010 23:43:51 -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 31713 invoked by uid 99); 9 Dec 2010 23:43:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Dec 2010 23:43:51 +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; Thu, 09 Dec 2010 23:43:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EFF6323889E9; Thu, 9 Dec 2010 23:43:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1044167 - in /cxf/branches/2.3.x-fixes: ./ systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ systests/jaxws/src/test/resources/wsdl_systest_jaxws/ Date: Thu, 09 Dec 2010 23:43:27 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101209234327.EFF6323889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Thu Dec 9 23:43:27 2010 New Revision: 1044167 URL: http://svn.apache.org/viewvc?rev=1044167&view=rev Log: Merged revisions 1043875-1043901,1043903-1043906,1043908-1043953,1043955-1043973 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1043875 | ffang | 2010-12-09 17:29:49 +0800 (四, 09 12 2010) | 1 line [CXF-3095]test to verify multiple xsd files work with schema-validation-enabled ........ r1043973 | ningjiang | 2010-12-09 22:28:32 +0800 (四, 09 12 2010) | 1 line Fixed the build error of cxf-systests-jaxws ........ Added: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java - copied unchanged from r1043875, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationClientServerTest.java cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java - copied, changed from r1043875, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/ - copied from r1043875, cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd - copied unchanged from r1043875, cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/request.xsd cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd - copied unchanged from r1043875, cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response-in.xsd cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd - copied unchanged from r1043875, cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/response.xsd cxf/branches/2.3.x-fixes/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl - copied unchanged from r1043875, cxf/trunk/systests/jaxws/src/test/resources/wsdl_systest_jaxws/schemaValidation.wsdl Modified: cxf/branches/2.3.x-fixes/ (props changed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Copied: cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java (from r1043875, cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java) URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java?p2=cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java&p1=cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java&r1=1043875&r2=1044167&rev=1044167&view=diff ============================================================================== --- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java (original) +++ cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServicePortTypeImpl.java Thu Dec 9 23:43:27 2010 @@ -26,7 +26,7 @@ import org.apache.cxf.jaxws.schemavalida @javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/") public class ServicePortTypeImpl implements ServicePortType { - @Override + public CkReponseType ckR(CkRequeteType ckRIn) { CkReponseType result = new CkReponseType(); ActionCheckMajType action = new ActionCheckMajType();