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 EF9F1EE42 for ; Tue, 25 Jun 2013 20:32:21 +0000 (UTC) Received: (qmail 26592 invoked by uid 500); 25 Jun 2013 20:32:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 26534 invoked by uid 500); 25 Jun 2013 20:32:21 -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 26527 invoked by uid 99); 25 Jun 2013 20:32:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jun 2013 20:32:21 +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; Tue, 25 Jun 2013 20:32:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 715E52388980; Tue, 25 Jun 2013 20:32:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1496631 - /cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java Date: Tue, 25 Jun 2013 20:32:01 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130625203201.715E52388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jun 25 20:32:01 2013 New Revision: 1496631 URL: http://svn.apache.org/r1496631 Log: Fix broken compile Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java?rev=1496631&r1=1496630&r2=1496631&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java (original) +++ cxf/trunk/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/spring/ApplicationContextTest.java Tue Jun 25 20:32:01 2013 @@ -108,7 +108,7 @@ public class ApplicationContextTest exte DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class); DestinationFactory factory = dfm.getDestinationFactory("http://cxf.apache.org/transports/http"); - Destination d = factory.getDestination(info); + Destination d = factory.getDestination(info, bus); assertTrue(d instanceof NettyHttpDestination); NettyHttpDestination jd = (NettyHttpDestination) d; assertEquals("foobar", jd.getServer().getContentEncoding()); @@ -119,16 +119,16 @@ public class ApplicationContextTest exte ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class); ConduitInitiator ci = cim.getConduitInitiator("http://cxf.apache.org/transports/http"); - HTTPConduit conduit = (HTTPConduit) ci.getConduit(info); + HTTPConduit conduit = (HTTPConduit) ci.getConduit(info, bus); assertEquals(97, conduit.getClient().getConnectionTimeout()); info.setName(new QName("urn:test:ns", "Bar")); - conduit = (HTTPConduit) ci.getConduit(info); + conduit = (HTTPConduit) ci.getConduit(info, bus); assertEquals(79, conduit.getClient().getConnectionTimeout()); NettyHttpDestination jd2 = (NettyHttpDestination)factory.getDestination( - getEndpointInfo("foo", "bar", "http://localhost:9001")); + getEndpointInfo("foo", "bar", "http://localhost:9001"), bus); engine = (NettyHttpServerEngine)jd2.getEngine(); //assertEquals(40000, engine.getMaxIdleTime()); @@ -136,7 +136,7 @@ public class ApplicationContextTest exte NettyHttpDestination jd3 = (NettyHttpDestination)factory.getDestination( - getEndpointInfo("sna", "foo", "https://localhost:9002")); + getEndpointInfo("sna", "foo", "https://localhost:9002"), bus); engine = (NettyHttpServerEngine)jd3.getEngine(); assertEquals(engine.getTlsServerParameters().getClientAuthentication().isWant(), true); @@ -144,7 +144,7 @@ public class ApplicationContextTest exte NettyHttpDestination jd4 = (NettyHttpDestination)factory.getDestination( - getEndpointInfo("sna", "foo2", "https://localhost:9003")); + getEndpointInfo("sna", "foo2", "https://localhost:9003"), bus); engine = (NettyHttpServerEngine)jd4.getEngine(); assertEquals(engine.getTlsServerParameters().getClientAuthentication().isWant(), false);