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 4E5821052F for ; Thu, 23 Jan 2014 11:16:52 +0000 (UTC) Received: (qmail 70437 invoked by uid 500); 23 Jan 2014 11:16:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 70390 invoked by uid 500); 23 Jan 2014 11:16:49 -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 70380 invoked by uid 99); 23 Jan 2014 11:16:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jan 2014 11:16:48 +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; Thu, 23 Jan 2014 11:16:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B9AE42388906; Thu, 23 Jan 2014 11:16:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1560639 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java Date: Thu, 23 Jan 2014 11:16:24 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140123111624.B9AE42388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Jan 23 11:16:24 2014 New Revision: 1560639 URL: http://svn.apache.org/r1560639 Log: [CXF-5495] Minor update to the Spring factory Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java?rev=1560639&r1=1560638&r2=1560639&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java Thu Jan 23 11:16:24 2014 @@ -24,16 +24,16 @@ import java.util.List; import org.apache.cxf.bus.spring.SpringBus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.feature.Feature; -import org.apache.cxf.interceptor.Interceptor; +import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.message.Message; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Import; @Import(JaxRsConfig.class) -public abstract class AbstractSpringConfigurationFactory implements ApplicationContextAware { +public abstract class AbstractSpringConfigurationFactory + extends AbstractBasicInterceptorProvider implements ApplicationContextAware { protected ApplicationContext applicationContext; @@ -65,22 +65,10 @@ public abstract class AbstractSpringConf return Collections.emptyList(); } - protected List> getInInterceptors() { - return Collections.emptyList(); - } - - protected List> getOutInterceptors() { - return Collections.emptyList(); - } - protected List getFeatures() { return Collections.emptyList(); } - protected List> getOutFaultInterceptors() { - return Collections.emptyList(); - } - protected String getAddress() { return "/"; }