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 039D717E7C for ; Tue, 28 Oct 2014 17:36:47 +0000 (UTC) Received: (qmail 61280 invoked by uid 500); 28 Oct 2014 17:36:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 61221 invoked by uid 500); 28 Oct 2014 17:36:46 -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 61210 invoked by uid 99); 28 Oct 2014 17:36:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2014 17:36:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 97AF9996521; Tue, 28 Oct 2014 17:36:46 +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 Message-Id: <883f098ed17f40bbb9b43c3cb4941a8e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fixing the 2.7.x build failure Date: Tue, 28 Oct 2014 17:36:46 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 3493406b8 -> 2d13ae6a2 Fixing the 2.7.x build failure Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d13ae6a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d13ae6a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d13ae6a Branch: refs/heads/2.7.x-fixes Commit: 2d13ae6a288dc71f1b9ff7bba286b970b4ef8e70 Parents: 3493406 Author: Sergey Beryozkin Authored: Tue Oct 28 17:36:25 2014 +0000 Committer: Sergey Beryozkin Committed: Tue Oct 28 17:36:25 2014 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2d13ae6a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java index 1257570..ca6d682 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java @@ -972,7 +972,7 @@ public class ProviderFactoryTest extends Assert { @Test public void testBadCustomExceptionMappersHierarchyWithGenerics() throws Exception { - ServerProviderFactory pf = ServerProviderFactory.getInstance(); + ProviderFactory pf = ProviderFactory.getInstance(); BadExceptionMapperA badExceptionMapperA = new BadExceptionMapperA(); pf.registerUserProvider(badExceptionMapperA); BadExceptionMapperB badExceptionMapperB = new BadExceptionMapperB(); @@ -989,7 +989,7 @@ public class ProviderFactoryTest extends Assert { @Test public void testGoodExceptionMappersHierarchyWithGenerics() throws Exception { - ServerProviderFactory pf = ServerProviderFactory.getInstance(); + ProviderFactory pf = ProviderFactory.getInstance(); GoodRuntimeExceptionAMapper runtimeExceptionAMapper = new GoodRuntimeExceptionAMapper(); pf.registerUserProvider(runtimeExceptionAMapper); GoodRuntimeExceptionBMapper runtimeExceptionBMapper = new GoodRuntimeExceptionBMapper();