Author: sergeyb
Date: Thu Apr 4 09:40:38 2013
New Revision: 1464400
URL: http://svn.apache.org/r1464400
Log:
[CXF-4938] Moving the static initializer out of CXFNonSpringJaxrsServlet to the
subclass
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
(with props)
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java?rev=1464400&view=auto
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
(added)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
Thu Apr 4 09:40:38 2013
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.servlet;
+
+import javax.ws.rs.ext.RuntimeDelegate;
+
+public class CXFJaxrsRuntimeDelegateServlet extends CXFNonSpringJaxrsServlet {
+
+ private static final long serialVersionUID = -1990992780035068714L;
+
+ static {
+ // Ensure that the correct JAX-RS implementation is loaded
+ RuntimeDelegate runtimeDelegate = new
org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl();
+ RuntimeDelegate.setInstance(runtimeDelegate);
+ }
+
+}
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFJaxrsRuntimeDelegateServlet.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=1464400&r1=1464399&r2=1464400&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
Thu Apr 4 09:40:38 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);
