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 1850810C89 for ; Tue, 3 Sep 2013 11:19:40 +0000 (UTC) Received: (qmail 57562 invoked by uid 500); 3 Sep 2013 11:19:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57522 invoked by uid 500); 3 Sep 2013 11:19:36 -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 57515 invoked by uid 99); 3 Sep 2013 11:19:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Sep 2013 11:19:36 +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, 03 Sep 2013 11:19:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 76A842388980; Tue, 3 Sep 2013 11:19:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1519647 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Date: Tue, 03 Sep 2013 11:19:15 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130903111915.76A842388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Sep 3 11:19:15 2013 New Revision: 1519647 URL: http://svn.apache.org/r1519647 Log: Minor updates to CXFNonSpringJaxrsServlet to make it simpler to override methods creating Application Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java 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=1519647&r1=1519646&r2=1519647&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 Tue Sep 3 11:19:15 2013 @@ -88,14 +88,13 @@ public class CXFNonSpringJaxrsServlet ex public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); - String splitChar = getParameterSplitChar(servletConfig); - String applicationClass = servletConfig.getInitParameter(JAXRS_APPLICATION_PARAM); if (applicationClass != null) { - createServerFromApplication(applicationClass, servletConfig, splitChar); + createServerFromApplication(applicationClass, servletConfig); return; } + String splitChar = getParameterSplitChar(servletConfig); JAXRSServerFactoryBean bean = new JAXRSServerFactoryBean(); bean.setBus(getBus()); @@ -428,18 +427,18 @@ public class CXFNonSpringJaxrsServlet ex } - protected void createServerFromApplication(String cName, ServletConfig servletConfig, - String splitChar) + protected void createServerFromApplication(String cName, ServletConfig servletConfig) throws ServletException { Map> props = new HashMap>(); cName = getClassNameAndProperties(cName, props); - Class appClass = loadClass(cName, "Application"); + Class appClass = loadApplicationClass(cName); Application app = (Application)createSingletonInstance(appClass, props, servletConfig); String ignoreParam = servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM); JAXRSServerFactoryBean bean = ResourceUtils.createApplication(app, MessageUtils.isTrue(ignoreParam), getStaticSubResolutionValue(servletConfig)); + String splitChar = getParameterSplitChar(servletConfig); setAllInterceptors(bean, servletConfig, splitChar); setInvoker(bean, servletConfig); setExtensions(bean, servletConfig); @@ -450,6 +449,10 @@ public class CXFNonSpringJaxrsServlet ex bean.create(); } + protected Class loadApplicationClass(String appClassName) throws ServletException { + return loadClass(appClassName, "Application"); + } + protected Class loadClass(String cName) throws ServletException { return loadClass(cName, "Resource"); }