Author: mstruk Date: 2011-05-30 13:28:39 -0400 (Mon, 30 May 2011) New Revision: 6579 Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp Modified: sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp Log: Single portlet - decorated, and undecorated Modified: sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml =================================================================== --- sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml 2011-05-30 14:16:11 UTC (rev 6578) +++ sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml 2011-05-30 17:28:39 UTC (rev 6579) @@ -12,6 +12,7 @@ <outputDirectory>simple-portal.war</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <excludes> + <exclude>**/web.xml</exclude> <exclude>**/jboss-web.xml</exclude> <exclude>**/context.xml</exclude> <exclude>**/jboss-portal-beans.xml</exclude> Modified: sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml 2011-05-30 14:16:11 UTC (rev 6578) +++ sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml 2011-05-30 17:28:39 UTC (rev 6579) @@ -42,6 +42,9 @@ <filter-mapping> <filter-name>ControllerFilter</filter-name> <url-pattern>*.jsp</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>FORWARD</dispatcher> </filter-mapping> <listener> <listener-class>org.gatein.pc.portal.SimplePortalInitializer</listener-class> Modified: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-05-30 14:16:11 UTC (rev 6578) +++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-05-30 17:28:39 UTC (rev 6579) @@ -45,6 +45,9 @@ <filter-mapping> <filter-name>ControllerFilter</filter-name> <url-pattern>*.jsp</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>FORWARD</dispatcher> </filter-mapping> <listener> <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp (rev 0) +++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp 2011-05-30 17:28:39 UTC (rev 6579) @@ -0,0 +1,30 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<%@ include file="/layouts/header.jsp" %> + +<portal:page> + <xportal:2columns> + <jsp:attribute name="leftcol"> + <jsp:include page="single-decorated.jsp"> + <jsp:param name="portlet" value="Cart"/> + <jsp:param name="app" value="samples-shoppingcart-portlet"/> + </jsp:include> + </jsp:attribute> + <jsp:attribute name="rightcol"> + <jsp:include page="single.jsp"> + <jsp:param name="portlet" value="JSPPortlet"/> + <jsp:param name="app" value="samples-jsp-portlet"/> + </jsp:include> + <jsp:include page="single-decorated.jsp"> + <jsp:param name="portlet" value="Catalog"/> + <jsp:param name="app" value="samples-shoppingcart-portlet"/> + </jsp:include> + </jsp:attribute> + </xportal:2columns> +</portal:page> + +<%@ include file="/layouts/footer.jsp" %> Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp (rev 0) +++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp 2011-05-30 17:28:39 UTC (rev 6579) @@ -0,0 +1,9 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<portal:page> + <xportal:portlet name="${param.portlet}" applicationName="${param.app}"/> +</portal:page> \ No newline at end of file Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp (rev 0) +++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp 2011-05-30 17:28:39 UTC (rev 6579) @@ -0,0 +1,10 @@ +<%@ page contentType="text/html" %> +<%@ page language="java" %> +<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %> +<%@ page isELIgnored="false" %> + +<portal:page> + <portal:portlet name="${param.portlet}" applicationName="${param.app}"> + <portal:portletmarkup/> + </portal:portlet> +</portal:page> Modified: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp =================================================================== --- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-05-30 14:16:11 UTC (rev 6578) +++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-05-30 17:28:39 UTC (rev 6579) @@ -32,8 +32,11 @@ <li> <a href="${pageContext.request.contextPath}/demo/demo4.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo4.jsp' ? 'selected' : ''}">Demo4</a> </li> - <!-- <li> + <a href="${pageContext.request.contextPath}/demo/demo5.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo5.jsp' ? 'selected' : ''}">Demo5</a> + </li> + <!-- + <li> <a href="${pageContext.request.contextPath}/demo/jsr-301.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a> </li> -->