Author: sergeyb Date: Thu Apr 4 13:08:02 2013 New Revision: 1464513 URL: http://svn.apache.org/r1464513 Log: Merged revisions 1464511 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1464511 | sergeyb | 2013-04-04 16:03:07 +0300 (Thu, 04 Apr 2013) | 27 lines Merged revisions 1464393,1464405 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1464393 | sergeyb | 2013-04-04 12:32:07 +0300 (Thu, 04 Apr 2013) | 9 lines Merged revisions 1464391 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1464391 | sergeyb | 2013-04-04 12:29:16 +0300 (Thu, 04 Apr 2013) | 1 line [CXF-4944] Getting RequestDispatcherProvider to save attributes with the custom convention ........ ................ r1464405 | sergeyb | 2013-04-04 12:47:00 +0300 (Thu, 04 Apr 2013) | 9 lines Merged revisions 1464400 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1464400 | sergeyb | 2013-04-04 12:40:38 +0300 (Thu, 04 Apr 2013) | 1 line [CXF-4938] Moving the static initializer out of CXFNonSpringJaxrsServlet to the subclass ........ ................ ................ Added: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java - copied unchanged from r1464511, cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java?rev=1464513&r1=1464512&r2=1464513&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java Thu Apr 4 13:08:02 2013 @@ -402,10 +402,7 @@ public class RequestDispatcherProvider e private void doSetParameters(String name, String[] values) { if (saveParamsAsAttributes) { - if (values.length == 1) { - super.setAttribute(name, values[0]); - } - super.setAttribute(name + "Array", values); + super.setAttribute(name, values); } else { params.put(name, values); } Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1464513&r1=1464512&r2=1464513&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java Thu Apr 4 13:08:02 2013 @@ -32,7 +32,6 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.ws.rs.core.Application; -import javax.ws.rs.ext.RuntimeDelegate; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.logging.LogUtils; @@ -52,11 +51,8 @@ import org.apache.cxf.service.invoker.In import org.apache.cxf.transport.servlet.CXFNonSpringServlet; public class CXFNonSpringJaxrsServlet extends CXFNonSpringServlet { - static { - // Ensure that the correct JAX-RS implementation is loaded - RuntimeDelegate runtimeDelegate = new org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl(); - RuntimeDelegate.setInstance(runtimeDelegate); - } + private static final long serialVersionUID = -8916352798780577499L; + private static final Logger LOG = LogUtils.getL7dLogger(CXFNonSpringJaxrsServlet.class); private static final String USER_MODEL_PARAM = "user.model";
