svn commit: r1464405 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

[sergeyb]

Author: sergeyb
Date: Thu Apr  4 09:47:00 2013
New Revision: 1464405

URL: http://svn.apache.org/r1464405
Log:
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.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
      - copied unchanged from r1464400, 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1464400

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java?rev=1464405&r1=1464404&r2=1464405&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
 Thu Apr  4 09:47:00 2013
@@ -33,7 +33,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;
@@ -54,12 +53,6 @@ import org.apache.cxf.transport.servlet.
 
 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);