Author: julien_viet Date: 2009-08-30 18:29:40 -0400 (Sun, 30 Aug 2009) New Revision: 137 Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java Removed: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java Modified: components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 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: Rename bootstrap servlet into GateInServlet as bootstrap is misleading name Deleted: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java 2009-08-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java 2009-08-30 22:29:40 UTC (rev 137) @@ -1,70 +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.command.CommandServlet; - -import javax.servlet.ServletException; -import javax.servlet.ServletContext; -import java.lang.reflect.Method; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class BootstrapServlet extends CommandServlet -{ - - /** . */ - private String contextPath; - - public void init() throws ServletException - { - try - { - Method m = ServletContext.class.getMethod("getContextPath", new Class[0]); - ServletContext servletContext = getServletContext(); - - // - String contextPath = (String)m.invoke(servletContext, new Object[0]); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader); - - // - GenericServletContainerContext.instance.register(webAppContext); - this.contextPath = contextPath; - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public void destroy() - { - if (contextPath != null) - { - GenericServletContainerContext.instance.unregister(contextPath); - } - } -} \ No newline at end of file Copied: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java (from rev 136, components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java) =================================================================== --- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java (rev 0) +++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2009-08-30 22:29:40 UTC (rev 137) @@ -0,0 +1,70 @@ +/****************************************************************************** + * 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.command.CommandServlet; + +import javax.servlet.ServletException; +import javax.servlet.ServletContext; +import java.lang.reflect.Method; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class GateInServlet extends CommandServlet +{ + + /** . */ + private String contextPath; + + public void init() throws ServletException + { + try + { + Method m = ServletContext.class.getMethod("getContextPath", new Class[0]); + ServletContext servletContext = getServletContext(); + + // + String contextPath = (String)m.invoke(servletContext, new Object[0]); + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader); + + // + GenericServletContainerContext.instance.register(webAppContext); + this.contextPath = contextPath; + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + public void destroy() + { + if (contextPath != null) + { + GenericServletContainerContext.instance.unregister(contextPath); + } + } +} \ No newline at end of file Modified: components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137) @@ -27,12 +27,12 @@ "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> <servlet> - <servlet-name>BootstrapServlet</servlet-name> - <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> - <servlet-name>BootstrapServlet</servlet-name> + <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> </web-app> 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-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137) @@ -43,8 +43,8 @@ <load-on-startup>0</load-on-startup> </servlet> <servlet> - <servlet-name>BootstrapServlet</servlet-name> - <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> @@ -52,7 +52,7 @@ <url-pattern>/</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>BootstrapServlet</servlet-name> + <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> </web-app> 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-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137) @@ -43,8 +43,8 @@ <load-on-startup>1</load-on-startup> </servlet> <servlet> - <servlet-name>BootstrapServlet</servlet-name> - <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> @@ -52,7 +52,7 @@ <url-pattern>/</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>BootstrapServlet</servlet-name> + <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> </web-app> 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-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137) @@ -43,8 +43,8 @@ <load-on-startup>0</load-on-startup> </servlet> <servlet> - <servlet-name>BootstrapServlet</servlet-name> - <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> @@ -52,7 +52,7 @@ <url-pattern>/</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>BootstrapServlet</servlet-name> + <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> </web-app> 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-30 22:14:11 UTC (rev 136) +++ components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137) @@ -43,8 +43,8 @@ <load-on-startup>0</load-on-startup> </servlet> <servlet> - <servlet-name>BootstrapServlet</servlet-name> - <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> @@ -52,7 +52,7 @@ <url-pattern>/</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>BootstrapServlet</servlet-name> + <servlet-name>GateInServlet</servlet-name> <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> </web-app>