Author: julien(a)jboss.com Date: 2008-01-30 04:46:12 -0500 (Wed, 30 Jan 2008) New Revision: 9647 Removed: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardedContainerAttributesTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludedContainerAttributesTestCase.java Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/dispatcher-war/WEB-INF/web.xml Log: remove unused classses now Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardedContainerAttributesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardedContainerAttributesTestCase.java 2008-01-30 07:31:44 UTC (rev 9646) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/ForwardedContainerAttributesTestCase.java 2008-01-30 09:46:12 UTC (rev 9647) @@ -1,62 +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.jboss.portal.test.portlet.jsr286.tck.dispatcher; - -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.portal.unit.annotations.TestCase; - -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletRequest; -import javax.portlet.PortletResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletContext; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -@TestCase -public class ForwardedContainerAttributesTestCase extends DispatchedContainerAttributesTestCase -{ - public ForwardedContainerAttributesTestCase(PortletTestCase seq) - { - super(seq, null); - } - - protected void dispatch(PortletRequestDispatcher dispatcher, PortletRequest request, PortletResponse response) throws IOException, PortletException - { - dispatcher.forward(request, response); - } - - protected String getDispatchType() - { - return "forward"; - } - - protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException - { - //To change body of implemented methods use File | Settings | File Templates. - } -} \ No newline at end of file Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludedContainerAttributesTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludedContainerAttributesTestCase.java 2008-01-30 07:31:44 UTC (rev 9646) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/IncludedContainerAttributesTestCase.java 2008-01-30 09:46:12 UTC (rev 9647) @@ -1,62 +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.jboss.portal.test.portlet.jsr286.tck.dispatcher; - -import org.jboss.portal.unit.PortletTestCase; -import org.jboss.portal.unit.Assertion; -import org.jboss.portal.unit.annotations.TestCase; - -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletRequest; -import javax.portlet.PortletResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletContext; -import java.io.IOException; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -(a)TestCase({Assertion.JSR168_127}) -public class IncludedContainerAttributesTestCase extends DispatchedContainerAttributesTestCase -{ - public IncludedContainerAttributesTestCase(PortletTestCase seq) - { - super(seq, null); - } - - protected void dispatch(PortletRequestDispatcher dispatcher, PortletRequest request, PortletResponse response) throws IOException, PortletException - { - dispatcher.include(request, response); - } - - protected String getDispatchType() - { - return "include"; - } - - protected void dispatch(PortletRequest request, PortletResponse response, PortletContext portletContext) throws IOException, PortletException - { - //To change body of implemented methods use File | Settings | File Templates. - } -} Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/dispatcher-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/jsr286/tck/dispatcher-war/WEB-INF/web.xml 2008-01-30 07:31:44 UTC (rev 9646) +++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/dispatcher-war/WEB-INF/web.xml 2008-01-30 09:46:12 UTC (rev 9647) @@ -51,6 +51,11 @@ <servlet-class>org.jboss.portal.test.portlet.framework.UTS4</servlet-class> </servlet> + <servlet> + <servlet-name>IncludeHopServlet</servlet-name> + <servlet-class>org.jboss.portal.test.portlet.jsr286.tck.dispatcher.IncludeHopServlet</servlet-class> + </servlet> + <servlet-mapping> <servlet-name>UniversalServletA</servlet-name> <url-pattern>/universalServletA/*</url-pattern> @@ -70,4 +75,9 @@ <servlet-name>UniversalServletD</servlet-name> <url-pattern>/universalServletD/*</url-pattern> </servlet-mapping> + + <servlet-mapping> + <servlet-name>IncludeHopServlet</servlet-name> + <url-pattern>/includeHopServlet/*</url-pattern> + </servlet-mapping> </web-app>