Author: julien(a)jboss.com Date: 2008-02-10 10:10:14 -0500 (Sun, 10 Feb 2008) New Revision: 9921 Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortletResult.java Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml Log: PortletResult should have been removed Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortletResult.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortletResult.java 2008-02-10 14:56:47 UTC (rev 9920) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/PortletResult.java 2008-02-10 15:10:14 UTC (rev 9921) @@ -1,59 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, 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.portlet.test.jsp; - -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.test.jsp.WindowDef; - -/** - * Combines the invocation of a portlet and the info on the portlet JSP tag. It does - * not need to be exposed out of this package. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class PortletResult -{ - - /** . */ - private final WindowDef windowDef; - - /** . */ - private final PortletInvocationResponse response; - - public PortletResult(WindowDef windowDef, PortletInvocationResponse response) - { - this.windowDef = windowDef; - this.response = response; - } - - public WindowDef getWindowDef() - { - return windowDef; - } - - public PortletInvocationResponse getResponse() - { - return response; - } -} Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-10 14:56:47 UTC (rev 9920) +++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-10 15:10:14 UTC (rev 9921) @@ -22,10 +22,10 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" +<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> <portlet> <portlet-name>ExceptionPortlet</portlet-name> @@ -43,8 +43,10 @@ <portlet-class>org.jboss.portal.portlet.portal.samples.basic.HeaderPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> - <mime-type>text/javascript</mime-type> </supports> + <supports> + <mime-type>text/javascript</mime-type> + </supports> <portlet-info> <title>HeaderPortlet</title> </portlet-info>