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 CAA9311E56 for ; Thu, 27 Mar 2014 14:14:57 +0000 (UTC) Received: (qmail 91347 invoked by uid 500); 27 Mar 2014 14:14:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 91171 invoked by uid 500); 27 Mar 2014 14:14:52 -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 91142 invoked by uid 99); 27 Mar 2014 14:14:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 14:14:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6C84B837DA5; Thu, 27 Mar 2014 14:14:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Thu, 27 Mar 2014 14:14:45 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e06ac196 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e06ac196 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e06ac196 Branch: refs/heads/master Commit: e06ac1967a2058a4ab1af07bd367ae44917aa299 Parents: ff86dd4 939b542 Author: Sergey Beryozkin Authored: Thu Mar 27 14:14:29 2014 +0000 Committer: Sergey Beryozkin Committed: Thu Mar 27 14:14:29 2014 +0000 ---------------------------------------------------------------------- .../jaxb/SchemaCollectionContextProxy.java | 12 ++++++-- .../transform/DelegatingNamespaceContext.java | 6 ++-- .../cxf/javascript/fortest/package-info.java | 11 ++----- .../jaxrs/provider/json/utils/JSONUtils.java | 9 ++++++ .../jaxrs/provider/json/JSONProviderTest.java | 23 +++++++++++++-- .../assertions/WSAActionAssertingHandler.java | 2 +- .../apache/cxf/sts/request/RequestParser.java | 6 ++-- .../cxf/ws/discovery/WSDiscoveryClientTest.java | 5 ++-- .../type_test/AbstractTypeTestClient.java | 31 -------------------- .../main/resources/wsdl/type_test/type_test.xsd | 2 +- .../wsdl/type_test/type_test_impl_java.xsl | 9 ------ 11 files changed, 54 insertions(+), 62 deletions(-) ----------------------------------------------------------------------