svn commit: r1519671 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

[sergeyb]

Author: sergeyb
Date: Tue Sep  3 13:20:31 2013
New Revision: 1519671

URL: http://svn.apache.org/r1519671
Log:
One more minor update to CXFNonSpringJaxrsServlet and the demo

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java

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=1519671&r1=1519670&r2=1519671&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
 Tue Sep  3 13:20:31 2013
@@ -429,10 +429,7 @@ public class CXFNonSpringJaxrsServlet ex
     
     protected void createServerFromApplication(String cName, ServletConfig 
servletConfig) 
         throws ServletException {
-        Map<String, List<String>> props = new HashMap<String, List<String>>();
-        cName = getClassNameAndProperties(cName, props);
-        Class<?> appClass = loadApplicationClass(cName);
-        Application app = (Application)createSingletonInstance(appClass, 
props, servletConfig);
+        Application app = createApplicationInstance(cName, servletConfig);
         
         String ignoreParam = 
servletConfig.getInitParameter(IGNORE_APP_PATH_PARAM);
         JAXRSServerFactoryBean bean = ResourceUtils.createApplication(app, 
@@ -449,6 +446,14 @@ public class CXFNonSpringJaxrsServlet ex
         bean.create();
     }
     
+    protected Application createApplicationInstance(String appClassName, 
ServletConfig servletConfig) 
+        throws ServletException {
+        Map<String, List<String>> props = new HashMap<String, List<String>>();
+        appClassName = getClassNameAndProperties(appClassName, props);
+        Class<?> appClass = loadApplicationClass(appClassName);
+        return (Application)createSingletonInstance(appClass, props, 
servletConfig);
+    }
+    
     protected Class<?> loadApplicationClass(String appClassName) throws 
ServletException {
         return loadClass(appClassName, "Application");
     }