You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/10/08 10:44:56 UTC
git commit: Fixing the jaxrs minimal_osgi demo compliation failure
Repository: cxf
Updated Branches:
refs/heads/master 4ebaac4f2 -> 9110a9f93
Fixing the jaxrs minimal_osgi demo compliation failure
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9110a9f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9110a9f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9110a9f9
Branch: refs/heads/master
Commit: 9110a9f933cd6b2532a172ac20d0976576f841c2
Parents: 4ebaac4
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Oct 8 09:44:32 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Oct 8 09:44:32 2014 +0100
----------------------------------------------------------------------
.../minimal_osgi/src/main/java/minimalosgi/SampleServlet.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9110a9f9/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
index a75274c..1d8b946 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
@@ -23,15 +23,16 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.ws.rs.core.Application;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
+import org.apache.cxf.jaxrs.model.ApplicationInfo;
public class SampleServlet extends CXFNonSpringJaxrsServlet {
private static final long serialVersionUID = -1531317723099896635L;
@Override
- protected Application createApplicationInstance(String appClassName, ServletConfig servletConfig)
+ protected ApplicationInfo createApplicationInstance(String appClassName, ServletConfig servletConfig)
throws ServletException {
- return new SampleApplication();
+ return new ApplicationInfo(new SampleApplication(), super.getBus());
}
}