Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 26806 invoked from network); 28 Mar 2011 14:31:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Mar 2011 14:31:41 -0000 Received: (qmail 61387 invoked by uid 500); 28 Mar 2011 14:31:41 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 61331 invoked by uid 500); 28 Mar 2011 14:31:40 -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 61324 invoked by uid 99); 28 Mar 2011 14:31:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2011 14:31:40 +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; Mon, 28 Mar 2011 14:31:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9DFFD23889E2; Mon, 28 Mar 2011 14:31:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1086254 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/ systests/jaxrs/src/... Date: Mon, 28 Mar 2011 14:31:19 -0000 To: commits@cxf.apache.org From: cschneider@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110328143119.9DFFD23889E2@eris.apache.org> Author: cschneider Date: Mon Mar 28 14:31:19 2011 New Revision: 1086254 URL: http://svn.apache.org/viewvc?rev=1086254&view=rev Log: CXF-3419 Fixes for jaxrs test failures Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1086254&r1=1086253&r2=1086254&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Mon Mar 28 14:31:19 2011 @@ -272,7 +272,7 @@ public class CXFNonSpringJaxrsServlet ex String ignoreParam = servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM); JAXRSServerFactoryBean bean = ResourceUtils.createApplication(app, MessageUtils.isTrue(ignoreParam)); - + bean.setBus(getBus()); bean.create(); } Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=1086254&r1=1086253&r2=1086254&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Mon Mar 28 14:31:19 2011 @@ -18,6 +18,10 @@ */ package org.apache.cxf.transport.servlet; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.management.RuntimeErrorException; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -50,17 +54,7 @@ public class CXFServlet extends Abstract public void init(ServletConfig sc) throws ServletException { super.init(sc); if (this.bus == null) { - ApplicationContext wac = WebApplicationContextUtils. - getWebApplicationContext(sc.getServletContext()); - String configLocation = sc.getInitParameter("config-location"); - if (wac == null && (configLocation != null)) { - wac = new ClassPathXmlApplicationContext(configLocation); - } - if (wac != null) { - this.bus = wac.getBean("cxf", Bus.class); - } else { - this.bus = BusFactory.newInstance().createBus(); - } + loadBus(sc); } ResourceManager resourceManager = bus.getExtension(ResourceManager.class); @@ -82,6 +76,25 @@ public class CXFServlet extends Abstract this.controller = createServletController(sc); } + private void loadBus(ServletConfig sc) { + ApplicationContext wac = WebApplicationContextUtils. + getWebApplicationContext(sc.getServletContext()); + String configLocation = sc.getInitParameter("config-location"); + if (wac == null && (configLocation != null)) { + try { + URL configUrl = sc.getServletContext().getResource(configLocation); + wac = new ClassPathXmlApplicationContext(configUrl.toExternalForm()); + } catch (MalformedURLException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + if (wac != null) { + this.bus = wac.getBean("cxf", Bus.class); + } else { + this.bus = BusFactory.newInstance().createBus(); + } + } + private ServletController createServletController(ServletConfig servletConfig) { HttpServlet serviceListGeneratorServlet = new ServiceListGeneratorServlet(transportFactory.getRegistry(), bus); Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml?rev=1086254&r1=1086253&r2=1086254&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml Mon Mar 28 14:31:19 2011 @@ -25,6 +25,7 @@ http://www.springframework.org/schema/be http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> + Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml?rev=1086254&r1=1086253&r2=1086254&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml (original) +++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_spring_providers/WEB-INF/beans.xml Mon Mar 28 14:31:19 2011 @@ -25,6 +25,7 @@ http://www.springframework.org/schema/be http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> +