svn commit: r1519672 - /cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java

[sergeyb]

Author: sergeyb
Date: Tue Sep  3 13:21:11 2013
New Revision: 1519672

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

Modified:
    
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java

Modified: 
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java?rev=1519672&r1=1519671&r2=1519672&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
 Tue Sep  3 13:21:11 2013
@@ -19,7 +19,9 @@
 
 package minimalosgi;
 
+import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.ws.rs.core.Application;
 import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
 
 public class SampleServlet extends CXFNonSpringJaxrsServlet {
@@ -27,8 +29,8 @@ public class SampleServlet extends CXFNo
     private static final long serialVersionUID = -1531317723099896635L;
 
     @Override
-    protected Class<?> loadApplicationClass(String cName) throws 
ServletException {
-        return SampleApplication.class;
+    protected Application createApplicationInstance(String appClassName, 
ServletConfig servletConfig) {
+        return new SampleApplication();
     }
 
 }