Author: julien_viet Date: 2009-09-01 07:35:37 -0400 (Tue, 01 Sep 2009) New Revision: 142 Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java Removed: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandDispatcher.java components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6ServletContainerContext.java components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml Log: GTNWCI-6 : Generic SPI implementation coexistence with native SPI implementations Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2009-09-01 11:35:37 UTC (rev 142) @@ -23,6 +23,8 @@ package org.gatein.wci.api; import org.gatein.wci.command.CommandServlet; +import org.gatein.wci.impl.generic.GenericServletContainerContext; +import org.gatein.wci.impl.generic.GenericWebAppContext; import javax.servlet.ServletException; import javax.servlet.ServletContext; @@ -42,16 +44,16 @@ { try { - Method m = ServletContext.class.getMethod("getContextPath", new Class[0]); + Method m = ServletContext.class.getMethod("getContextPath"); ServletContext servletContext = getServletContext(); // - String contextPath = (String)m.invoke(servletContext, new Object[0]); + String contextPath = (String)m.invoke(servletContext); ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader); // - GenericServletContainerContext.instance.register(webAppContext); + GenericServletContainerContext.register(webAppContext); this.contextPath = contextPath; } catch (Exception e) @@ -64,7 +66,7 @@ { if (contextPath != null) { - GenericServletContainerContext.instance.unregister(contextPath); + GenericServletContainerContext.unregister(contextPath); } } } \ No newline at end of file Deleted: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -1,92 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.gatein.wci.api; - -import org.gatein.wci.RequestDispatchCallback; -import org.gatein.wci.impl.DefaultServletContainerFactory; -import org.gatein.wci.spi.ServletContainerContext; -import org.gatein.wci.command.CommandDispatcher; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -class GenericServletContainerContext implements ServletContainerContext -{ - - /** . */ - static final GenericServletContainerContext instance = new GenericServletContainerContext(); - - /** . */ - private Registration registration; - - static - { - DefaultServletContainerFactory.registerContext(instance); - } - - void register(GenericWebAppContext webAppContext) - { - if (registration != null) - { - registration.registerWebApp(webAppContext); - } - } - - void unregister(String webAppId) - { - if (registration != null) - { - registration.unregisterWebApp(webAppId); - } - } - - /** . */ - private final CommandDispatcher dispatcher = new CommandDispatcher(); - - public Object include( - ServletContext targetServletContext, - HttpServletRequest request, - HttpServletResponse response, - RequestDispatchCallback callback, - Object handback) throws ServletException, IOException - { - return dispatcher.include(targetServletContext, request, response, callback, handback); - } - - public void setCallback(Registration registration) - { - this.registration = registration; - } - - public void unsetCallback(Registration registration) - { - this.registration = null; - } -} \ No newline at end of file Deleted: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -1,81 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.gatein.wci.api; - -import org.gatein.wci.spi.WebAppContext; - -import javax.servlet.ServletContext; -import java.io.InputStream; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -class GenericWebAppContext implements WebAppContext -{ - - /** . */ - private final ServletContext servletContext; - - /** . */ - private final String contextPath; - - /** . */ - private final ClassLoader classLoader; - - public GenericWebAppContext(ServletContext servletContext, String contextPath, ClassLoader classLoader) - { - this.servletContext = servletContext; - this.contextPath = contextPath; - this.classLoader = classLoader; - } - - public void start() throws Exception - { - } - - public void stop() - { - } - - public ServletContext getServletContext() - { - return servletContext; - } - - public ClassLoader getClassLoader() - { - return classLoader; - } - - public String getContextPath() - { - return contextPath; - } - - public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException - { - return false; - } -} \ No newline at end of file Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandDispatcher.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandDispatcher.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandDispatcher.java 2009-09-01 11:35:37 UTC (rev 142) @@ -37,7 +37,15 @@ public class CommandDispatcher { - public Object include( + /** . */ + private final String servletPath; + + public CommandDispatcher(String servletPath) + { + this.servletPath = servletPath; + } + + public Object include( ServletContext targetServletContext, HttpServletRequest req, HttpServletResponse resp, @@ -47,7 +55,7 @@ CallbackCommand cmd = new CallbackCommand(targetServletContext, callback, handback); // - return CommandServlet.include(req, resp, cmd, targetServletContext); + return CommandServlet.include(servletPath, req, resp, cmd, targetServletContext); } public static class CallbackCommand Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java 2009-09-01 11:35:37 UTC (rev 142) @@ -43,13 +43,13 @@ { /** . */ - private static final ThreadLocal localCmd = new ThreadLocal(); + private static final ThreadLocal<Object> localCmd = new ThreadLocal<Object>(); /** . */ - private static final ThreadLocal localResponse = new ThreadLocal(); + private static final ThreadLocal<Object> localResponse = new ThreadLocal<Object>(); /** . */ - private static final ThreadLocal localThrowable = new ThreadLocal(); + private static final ThreadLocal<Throwable> localThrowable = new ThreadLocal<Throwable>(); /** * <p>Execute a command after having performed a request dispatch in the target servlet context.</p> @@ -61,12 +61,17 @@ * <p>Any throwable thrown by the callback invocation will be wrapped in a <code>ServletException</code> and * rethrown, unless it is an instance of <code>ServletException</code> or <code>IOException</code>.</p> * + * @param servletPath the servlet path on which the command servlet is mapped + * @param request the servlet container request + * @param response the servlet container response * @param callback the callback to invoke after the inclusion is done * @param targetContext the target servlet context + * @return the object returned by the callback * @throws IOException likely thrown by the request dispatch operation * @throws ServletException wraps any exception thrown by the callback */ - public static Object include( + static Object include( + String servletPath, HttpServletRequest request, HttpServletResponse response, Object callback, @@ -75,11 +80,11 @@ try { localCmd.set(callback); - RequestDispatcher switcher = targetContext.getRequestDispatcher("/gateinservlet"); + RequestDispatcher switcher = targetContext.getRequestDispatcher(servletPath); switcher.include(request, response); // - Throwable throwable = (Throwable)localThrowable.get(); + Throwable throwable = localThrowable.get(); // if (throwable != null) @@ -127,7 +132,7 @@ HttpServletResponse.class}); // - Object response = methods.invoke(cmd, new Object[]{req, resp}); + Object response = methods.invoke(cmd, req, resp); // localResponse.set(response); Copied: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java (from rev 141, components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java) =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java (rev 0) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -0,0 +1,141 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wci.impl.generic; + +import org.gatein.wci.RequestDispatchCallback; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wci.spi.ServletContainerContext; +import org.gatein.wci.command.CommandDispatcher; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Collections; +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GenericServletContainerContext implements ServletContainerContext, ServletContextListener +{ + + /** . */ + private static final Map<String, GenericWebAppContext> pendingContexts = Collections.synchronizedMap(new HashMap<String, GenericWebAppContext>()); + + /** . */ + private static GenericServletContainerContext instance; + + public static GenericServletContainerContext getInstance() + { + return instance; + } + + /** . */ + private Registration registration; + + public GenericServletContainerContext() + { + } + + public static void register(GenericWebAppContext webAppContext) + { + if (instance != null && instance.registration != null) + { + instance.registration.registerWebApp(webAppContext); + } + else + { + pendingContexts.put(webAppContext.getContextPath(), webAppContext); + } + } + + public static void unregister(String contextPath) + { + if (instance != null && instance.registration != null) + { + instance.registration.unregisterWebApp(contextPath); + } + + // + if (pendingContexts.containsKey(contextPath)) + { + pendingContexts.remove(contextPath); + } + } + + /** . */ + private final CommandDispatcher dispatcher = new CommandDispatcher("/gateinservlet"); + + public Object include( + ServletContext targetServletContext, + HttpServletRequest request, + HttpServletResponse response, + RequestDispatchCallback callback, + Object handback) throws ServletException, IOException + { + return dispatcher.include(targetServletContext, request, response, callback, handback); + } + + public void setCallback(Registration registration) + { + this.registration = registration; + + // + for (GenericWebAppContext pendingContext : pendingContexts.values()) + { + registration.registerWebApp(pendingContext); + } + } + + public void unsetCallback(Registration registration) + { + this.registration = null; + } + + // + + public void contextInitialized(ServletContextEvent servletContextEvent) + { + if (instance != null) + { + throw new IllegalStateException("Shared instance singleton already created"); + } + + // + instance = this; + + // Register + DefaultServletContainerFactory.registerContext(this); + } + + public void contextDestroyed(ServletContextEvent servletContextEvent) + { + // Should we really do something ? + } +} \ No newline at end of file Copied: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java (from rev 141, components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java) =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java (rev 0) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/GenericWebAppContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -0,0 +1,81 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wci.impl.generic; + +import org.gatein.wci.spi.WebAppContext; + +import javax.servlet.ServletContext; +import java.io.InputStream; +import java.io.IOException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GenericWebAppContext implements WebAppContext +{ + + /** . */ + private final ServletContext servletContext; + + /** . */ + private final String contextPath; + + /** . */ + private final ClassLoader classLoader; + + public GenericWebAppContext(ServletContext servletContext, String contextPath, ClassLoader classLoader) + { + this.servletContext = servletContext; + this.contextPath = contextPath; + this.classLoader = classLoader; + } + + public void start() throws Exception + { + } + + public void stop() + { + } + + public ServletContext getServletContext() + { + return servletContext; + } + + public ClassLoader getClassLoader() + { + return classLoader; + } + + public String getContextPath() + { + return contextPath; + } + + public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException + { + return false; + } +} \ No newline at end of file Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6ServletContainerContext.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6ServletContainerContext.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6ServletContainerContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -57,7 +57,7 @@ private final static Logger log = Logger.getLogger(TC6ServletContainerContext.class); /** . */ - private final CommandDispatcher dispatcher = new CommandDispatcher(); + private final CommandDispatcher dispatcher = new CommandDispatcher("/tomcatgateinservlet"); /** The monitored hosts. */ private final Set<String> monitoredHosts = new HashSet<String>(); Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java 2009-09-01 11:35:37 UTC (rev 142) @@ -75,11 +75,11 @@ try { commandServlet = context.createWrapper(); - commandServlet.setName("GateInServlet"); + commandServlet.setName("TomcatGateInServlet"); commandServlet.setLoadOnStartup(0); commandServlet.setServletClass(CommandServlet.class.getName()); context.addChild(commandServlet); - context.addServletMapping("/gateinservlet", "GateInServlet"); + context.addServletMapping("/tomcatgateinservlet", "TomcatGateInServlet"); } catch (Exception e) { @@ -99,7 +99,7 @@ { try { - context.removeServletMapping("gateinservlet"); + context.removeServletMapping("tomcatgateinservlet"); context.removeChild(commandServlet); } catch (Exception e) Modified: components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-09-01 11:35:37 UTC (rev 142) @@ -37,6 +37,9 @@ <listener> <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> <servlet> <servlet-name>TestServlet</servlet-name> <servlet-class>org.gatein.wci.TestServlet</servlet-class> Modified: components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-09-01 11:35:37 UTC (rev 142) @@ -37,6 +37,9 @@ <listener> <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> <servlet> <servlet-name>TestServlet</servlet-name> <servlet-class>org.gatein.wci.TestServlet</servlet-class> Modified: components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-09-01 11:35:37 UTC (rev 142) @@ -37,6 +37,9 @@ <listener> <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> <servlet> <servlet-name>TestServlet</servlet-name> <servlet-class>org.gatein.wci.TestServlet</servlet-class> Modified: components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-31 02:20:50 UTC (rev 141) +++ components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-09-01 11:35:37 UTC (rev 142) @@ -37,6 +37,9 @@ <listener> <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> <servlet> <servlet-name>TestServlet</servlet-name> <servlet-class>org.gatein.wci.TestServlet</servlet-class>