Author: sergeyb Date: Fri Mar 9 22:55:11 2012 New Revision: 1299093 URL: http://svn.apache.org/viewvc?rev=1299093&view=rev Log: Merged revisions 1299092 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1299092 | sergeyb | 2012-03-09 22:52:34 +0000 (Fri, 09 Mar 2012) | 9 lines Merged revisions 1298830 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1298830 | sergeyb | 2012-03-09 14:01:18 +0000 (Fri, 09 Mar 2012) | 1 line [CXF-4171,CXF-3743] Fixing property name typo and adding an option to set the static sub resolution in CXFNonSpringJaxrsServlet ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 9 22:55:11 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1299092 +/cxf/trunk:1298830 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1299093&r1=1299092&r2=1299093&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Fri Mar 9 22:55:11 2012 @@ -62,8 +62,9 @@ public class CXFNonSpringJaxrsServlet ex private static final String SERVICE_SCOPE_PARAM = "jaxrs.scope"; private static final String EXTENSIONS_PARAM = "jaxrs.extensions"; private static final String LANGUAGES_PARAM = "jaxrs.languages"; - private static final String PROPERTIES_PARAM = "jaxrs.languages"; + private static final String PROPERTIES_PARAM = "jaxrs.properties"; private static final String SCHEMAS_PARAM = "jaxrs.schemaLocations"; + private static final String STATIC_SUB_RESOLUTION_PARAM = "jaxrs.static.subresources"; private static final String SERVICE_SCOPE_SINGLETON = "singleton"; private static final String SERVICE_SCOPE_REQUEST = "prototype"; @@ -108,10 +109,18 @@ public class CXFNonSpringJaxrsServlet ex bean.setResourceProvider(entry.getKey(), entry.getValue()); } setExtensions(bean, servletConfig); + setStaticSubResolution(bean, servletConfig); bean.create(); } + protected void setStaticSubResolution(JAXRSServerFactoryBean bean, ServletConfig servletConfig) { + String param = servletConfig.getInitParameter(STATIC_SUB_RESOLUTION_PARAM); + if (param != null) { + bean.setStaticSubresourceResolution(Boolean.valueOf(param.trim())); + } + } + protected void setExtensions(JAXRSServerFactoryBean bean, ServletConfig servletConfig) { bean.setExtensionMappings(handleMapSequence(servletConfig.getInitParameter(EXTENSIONS_PARAM))); bean.setLanguageMappings(handleMapSequence(servletConfig.getInitParameter(LANGUAGES_PARAM))); @@ -350,6 +359,7 @@ public class CXFNonSpringJaxrsServlet ex setAllInterceptors(bean, servletConfig); setExtensions(bean, servletConfig); setSchemasLocations(bean, servletConfig); + setStaticSubResolution(bean, servletConfig); bean.setBus(getBus()); bean.create(); }
