[jbossws-commits] JBossWS SVN: r14033 - stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

Author: alessio.soldano(a)jboss.com Date: 2011-04-07 09:38:37 -0400 (Thu, 07 Apr 2011) New Revision: 14033 Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java Log: CXF servlet extensions now implement ServletDelegate Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java =================================================================== --- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-07 13:37:29 UTC (rev 14032) +++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-07 13:38:37 UTC (rev 14033) @@ -21,7 +21,10 @@ */ package org.jboss.wsf.stack.cxf; +import java.io.IOException; + import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,6 +36,7 @@ import org.apache.cxf.transport.servlet.ServletController; import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.ServletDelegate; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.transport.ServletHelper; @@ -43,7 +47,7 @@ * @since 16-Jun-2010 * */ -public class CXFNonSpringServletExt extends CXFNonSpringServlet +public class CXFNonSpringServletExt extends CXFNonSpringServlet implements ServletDelegate { protected Endpoint endpoint; @@ -95,4 +99,46 @@ { ServletHelper.callPreDestroy(endpoint); } + + @Override + public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doHead(request, response); + } + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doGet(request, response); + } + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doPost(request, response); + } + + @Override + public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doPut(request, response); + } + + @Override + public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doDelete(request, response); + } + + @Override + public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.service(request, response); + } } Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-07 13:37:29 UTC (rev 14032) +++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-07 13:38:37 UTC (rev 14033) @@ -21,7 +21,10 @@ */ package org.jboss.wsf.stack.cxf; +import java.io.IOException; + import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -33,6 +36,7 @@ import org.apache.cxf.transport.servlet.ServletController; import org.apache.cxf.transport.servlet.ServletTransportFactory; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.ServletDelegate; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.transport.ServletHelper; @@ -44,7 +48,7 @@ * * @since 21-Apr-2007 */ -public class CXFServletExt extends CXFServlet +public class CXFServletExt extends CXFServlet implements ServletDelegate { protected Endpoint endpoint; @@ -95,6 +99,46 @@ { ServletHelper.callPreDestroy(endpoint); } - + @Override + public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doHead(request, response); + } + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doGet(request, response); + } + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doPost(request, response); + } + + @Override + public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doPut(request, response); + } + + @Override + public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.doDelete(request, response); + } + + @Override + public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context) + throws ServletException, IOException + { + this.service(request, response); + } }